diff --git a/cyberchef/vars/default.yml b/cyberchef/vars/default.yml index 7b9b278..3dd7f72 100644 --- a/cyberchef/vars/default.yml +++ b/cyberchef/vars/default.yml @@ -5,4 +5,4 @@ http_conf: "cyberchef.tanshu.com.conf" container: cyberchef image: ghcr.io/gchq/cyberchef:latest -host_port: 8003 \ No newline at end of file +host_port: 8003 diff --git a/gitea/playbook-pg.yml b/gitea/playbook-pg.yml index 5b5f86f..4324f3c 100755 --- a/gitea/playbook-pg.yml +++ b/gitea/playbook-pg.yml @@ -19,7 +19,8 @@ name: "{{ container_image }}" source: pull - - getent: + - name: Look up the Gitea user + getent: database: passwd key: "{{ user }}" split: ":" @@ -60,4 +61,3 @@ # dest: "/etc/nginx/sites-enabled/{{ http_conf }}" # state: link # notify: Reload Nginx - diff --git a/grav/playbook.yml b/grav/playbook.yml index 5f73daf..e16fefe 100755 --- a/grav/playbook.yml +++ b/grav/playbook.yml @@ -57,4 +57,3 @@ service: name: nginx state: reloaded - diff --git a/hugo/playbook.yaml b/hugo/playbook.yaml index c7a58f3..bba9776 100644 --- a/hugo/playbook.yaml +++ b/hugo/playbook.yaml @@ -36,4 +36,4 @@ - name: Configure Gitea integration lineinfile: path: "{{ host_directory }}/config.toml" - line: 'theme = "decap"' \ No newline at end of file + line: 'theme = "decap"' diff --git a/hugo/vars/default.yml b/hugo/vars/default.yml index ce5f800..d473c86 100644 --- a/hugo/vars/default.yml +++ b/hugo/vars/default.yml @@ -5,4 +5,3 @@ http_url: "https://hugo.tanshu.com" container_name: gitea container_image: gitea/gitea:latest - diff --git a/iot/roles/caddy/defaults/main.yaml b/iot/roles/caddy/defaults/main.yaml index 86c1bb0..c70cd8d 100644 --- a/iot/roles/caddy/defaults/main.yaml +++ b/iot/roles/caddy/defaults/main.yaml @@ -1,4 +1,3 @@ - caddy_container: caddy caddyfile_path: /var/lib/caddy/conf/Caddyfile snippet_block: | diff --git a/iot/roles/caddy/handlers/main.yaml b/iot/roles/caddy/handlers/main.yaml index c3a3720..d38f394 100644 --- a/iot/roles/caddy/handlers/main.yaml +++ b/iot/roles/caddy/handlers/main.yaml @@ -4,4 +4,4 @@ docker_container: name: "{{ caddy_container }}" state: started - restart: true \ No newline at end of file + restart: true diff --git a/iot/roles/caddy/tasks/main.yaml b/iot/roles/caddy/tasks/main.yaml index c3ccc90..9da2009 100644 --- a/iot/roles/caddy/tasks/main.yaml +++ b/iot/roles/caddy/tasks/main.yaml @@ -19,4 +19,4 @@ block: "{{ snippet_block }}" create: yes when: not snippet_present - notify: Restart caddy container \ No newline at end of file + notify: Restart caddy container diff --git a/iot/roles/grafana/tasks/main.yaml b/iot/roles/grafana/tasks/main.yaml index b47528b..5f89794 100644 --- a/iot/roles/grafana/tasks/main.yaml +++ b/iot/roles/grafana/tasks/main.yaml @@ -1,6 +1,7 @@ --- # Tasks for Grafana role -- getent: +- name: Look up the Grafana user + getent: database: passwd key: "{{ grafana_user }}" split: ":" diff --git a/iot/roles/influxdb/tasks/main.yaml b/iot/roles/influxdb/tasks/main.yaml index 703f03b..fbc3e04 100644 --- a/iot/roles/influxdb/tasks/main.yaml +++ b/iot/roles/influxdb/tasks/main.yaml @@ -1,6 +1,7 @@ --- # Tasks for InfluxDB role -- getent: +- name: Look up the InfluxDB user + getent: database: passwd key: "{{ influx_user }}" split: ":" @@ -49,4 +50,3 @@ volumes: - "{{ influx_directory }}/data:/var/lib/influxdb2" - "{{ influx_directory }}/config:/etc/influxdb2" - diff --git a/iot/roles/mosquitto/tasks/main.yaml b/iot/roles/mosquitto/tasks/main.yaml index f3abd20..d10b26f 100644 --- a/iot/roles/mosquitto/tasks/main.yaml +++ b/iot/roles/mosquitto/tasks/main.yaml @@ -1,6 +1,7 @@ --- # Tasks for Mosquitto role -- getent: +- name: Look up the Mosquitto user + getent: database: passwd key: "{{ mosquitto_user }}" split: ":" @@ -79,4 +80,3 @@ - name: Encrypt the docker file command: docker exec -i mosquitto mosquitto_passwd -U /mosquitto/config/passwd - diff --git a/iot/roles/network/tasks/main.yaml b/iot/roles/network/tasks/main.yaml index 15d1be9..0f4f125 100644 --- a/iot/roles/network/tasks/main.yaml +++ b/iot/roles/network/tasks/main.yaml @@ -6,4 +6,4 @@ state: present connected: - caddy - appends: yes \ No newline at end of file + appends: yes diff --git a/iot/roles/nodered/tasks/main.yaml b/iot/roles/nodered/tasks/main.yaml index 317df0c..6f3165f 100644 --- a/iot/roles/nodered/tasks/main.yaml +++ b/iot/roles/nodered/tasks/main.yaml @@ -1,5 +1,6 @@ --- -- getent: +- name: Look up the Node-RED user + getent: database: passwd key: "{{ nodered_user }}" split: ":" diff --git a/iot/vars/default.yml b/iot/vars/default.yml index 7f670c7..9c8b44e 100644 --- a/iot/vars/default.yml +++ b/iot/vars/default.yml @@ -24,4 +24,4 @@ grafana_user: "{{ user }}" host: iot.tanshu.com -docker_network: iot_net \ No newline at end of file +docker_network: iot_net diff --git a/rabbitmq/playbook.yml b/rabbitmq/playbook.yml index 60a4336..9e7fd86 100755 --- a/rabbitmq/playbook.yml +++ b/rabbitmq/playbook.yml @@ -21,4 +21,3 @@ restart_policy: "unless-stopped" published_ports: - 5672:5672 - diff --git a/rabbitmq/vars/default.yml b/rabbitmq/vars/default.yml index 4fb1d11..022b370 100644 --- a/rabbitmq/vars/default.yml +++ b/rabbitmq/vars/default.yml @@ -1,4 +1,3 @@ --- container_name: rabbit image_name: rabbitmq:alpine - diff --git a/registry/roles/caddy/handlers/main.yaml b/registry/roles/caddy/handlers/main.yaml index c3a3720..d38f394 100644 --- a/registry/roles/caddy/handlers/main.yaml +++ b/registry/roles/caddy/handlers/main.yaml @@ -4,4 +4,4 @@ docker_container: name: "{{ caddy_container }}" state: started - restart: true \ No newline at end of file + restart: true diff --git a/registry/roles/caddy/tasks/main.yaml b/registry/roles/caddy/tasks/main.yaml index c3ccc90..9da2009 100644 --- a/registry/roles/caddy/tasks/main.yaml +++ b/registry/roles/caddy/tasks/main.yaml @@ -19,4 +19,4 @@ block: "{{ snippet_block }}" create: yes when: not snippet_present - notify: Restart caddy container \ No newline at end of file + notify: Restart caddy container diff --git a/stirling-pdf/roles/stirling/tasks/main.yaml b/stirling-pdf/roles/stirling/tasks/main.yaml index e892c75..6f0c494 100644 --- a/stirling-pdf/roles/stirling/tasks/main.yaml +++ b/stirling-pdf/roles/stirling/tasks/main.yaml @@ -29,7 +29,7 @@ dest: "/var/lib/{{ host_directory }}/training-data/eng.traineddata" mode: '0644' when: not traineddata.stat.exists - + - name: Create Stirling-PDF container docker_container: name: "{{ container }}" @@ -46,4 +46,4 @@ - "/var/lib/{{ host_directory }}/training-data:/usr/share/tessdata" - "/var/lib/{{ host_directory }}/extra-configs:/configs" - "/var/lib/{{ host_directory }}/logs:/logs" - - "/var/lib/{{ host_directory }}/custom-files:/customFiles" \ No newline at end of file + - "/var/lib/{{ host_directory }}/custom-files:/customFiles" diff --git a/stirling-pdf/vars/default.yml b/stirling-pdf/vars/default.yml index 7abb650..be3e739 100644 --- a/stirling-pdf/vars/default.yml +++ b/stirling-pdf/vars/default.yml @@ -6,4 +6,4 @@ container: stirling-pdf image: frooodle/s-pdf:latest host_directory: stirling-pdf -host_port: 8002 \ No newline at end of file +host_port: 8002 diff --git a/wekan/playbook.yml b/wekan/playbook.yml index d953909..bd2f60f 100755 --- a/wekan/playbook.yml +++ b/wekan/playbook.yml @@ -56,4 +56,3 @@ service: name: nginx state: reloaded -