Make the existing playbooks pass the new checks
Strip trailing whitespace and blank lines, name the getent tasks, and fix Jinja spacing.
This commit is contained in:
1 parent
0df4054cc2
commit
4ddeba5402
21 files changed
+21
-25
No files matched your search
@@ -5,4 +5,4 @@ http_conf: "cyberchef.tanshu.com.conf"
|
|||||||
container: cyberchef
|
container: cyberchef
|
||||||
image: ghcr.io/gchq/cyberchef:latest
|
image: ghcr.io/gchq/cyberchef:latest
|
||||||
|
|
||||||
host_port: 8003
|
host_port: 8003
|
||||||
@@ -19,7 +19,8 @@
|
|||||||
name: "{{ container_image }}"
|
name: "{{ container_image }}"
|
||||||
source: pull
|
source: pull
|
||||||
|
|
||||||
- getent:
|
- name: Look up the Gitea user
|
||||||
|
getent:
|
||||||
database: passwd
|
database: passwd
|
||||||
key: "{{ user }}"
|
key: "{{ user }}"
|
||||||
split: ":"
|
split: ":"
|
||||||
@@ -60,4 +61,3 @@
|
|||||||
# dest: "/etc/nginx/sites-enabled/{{ http_conf }}"
|
# dest: "/etc/nginx/sites-enabled/{{ http_conf }}"
|
||||||
# state: link
|
# state: link
|
||||||
# notify: Reload Nginx
|
# notify: Reload Nginx
|
||||||
|
|
||||||
@@ -57,4 +57,3 @@
|
|||||||
service:
|
service:
|
||||||
name: nginx
|
name: nginx
|
||||||
state: reloaded
|
state: reloaded
|
||||||
|
|
||||||
+1
-1
@@ -36,4 +36,4 @@
|
|||||||
- name: Configure Gitea integration
|
- name: Configure Gitea integration
|
||||||
lineinfile:
|
lineinfile:
|
||||||
path: "{{ host_directory }}/config.toml"
|
path: "{{ host_directory }}/config.toml"
|
||||||
line: 'theme = "decap"'
|
line: 'theme = "decap"'
|
||||||
@@ -5,4 +5,3 @@ http_url: "https://hugo.tanshu.com"
|
|||||||
|
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
container_image: gitea/gitea:latest
|
container_image: gitea/gitea:latest
|
||||||
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
caddy_container: caddy
|
caddy_container: caddy
|
||||||
caddyfile_path: /var/lib/caddy/conf/Caddyfile
|
caddyfile_path: /var/lib/caddy/conf/Caddyfile
|
||||||
snippet_block: |
|
snippet_block: |
|
||||||
|
|||||||
@@ -4,4 +4,4 @@
|
|||||||
docker_container:
|
docker_container:
|
||||||
name: "{{ caddy_container }}"
|
name: "{{ caddy_container }}"
|
||||||
state: started
|
state: started
|
||||||
restart: true
|
restart: true
|
||||||
@@ -19,4 +19,4 @@
|
|||||||
block: "{{ snippet_block }}"
|
block: "{{ snippet_block }}"
|
||||||
create: yes
|
create: yes
|
||||||
when: not snippet_present
|
when: not snippet_present
|
||||||
notify: Restart caddy container
|
notify: Restart caddy container
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
---
|
---
|
||||||
# Tasks for Grafana role
|
# Tasks for Grafana role
|
||||||
- getent:
|
- name: Look up the Grafana user
|
||||||
|
getent:
|
||||||
database: passwd
|
database: passwd
|
||||||
key: "{{ grafana_user }}"
|
key: "{{ grafana_user }}"
|
||||||
split: ":"
|
split: ":"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
---
|
---
|
||||||
# Tasks for InfluxDB role
|
# Tasks for InfluxDB role
|
||||||
- getent:
|
- name: Look up the InfluxDB user
|
||||||
|
getent:
|
||||||
database: passwd
|
database: passwd
|
||||||
key: "{{ influx_user }}"
|
key: "{{ influx_user }}"
|
||||||
split: ":"
|
split: ":"
|
||||||
@@ -49,4 +50,3 @@
|
|||||||
volumes:
|
volumes:
|
||||||
- "{{ influx_directory }}/data:/var/lib/influxdb2"
|
- "{{ influx_directory }}/data:/var/lib/influxdb2"
|
||||||
- "{{ influx_directory }}/config:/etc/influxdb2"
|
- "{{ influx_directory }}/config:/etc/influxdb2"
|
||||||
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
---
|
---
|
||||||
# Tasks for Mosquitto role
|
# Tasks for Mosquitto role
|
||||||
- getent:
|
- name: Look up the Mosquitto user
|
||||||
|
getent:
|
||||||
database: passwd
|
database: passwd
|
||||||
key: "{{ mosquitto_user }}"
|
key: "{{ mosquitto_user }}"
|
||||||
split: ":"
|
split: ":"
|
||||||
@@ -79,4 +80,3 @@
|
|||||||
|
|
||||||
- name: Encrypt the docker file
|
- name: Encrypt the docker file
|
||||||
command: docker exec -i mosquitto mosquitto_passwd -U /mosquitto/config/passwd
|
command: docker exec -i mosquitto mosquitto_passwd -U /mosquitto/config/passwd
|
||||||
|
|
||||||
@@ -6,4 +6,4 @@
|
|||||||
state: present
|
state: present
|
||||||
connected:
|
connected:
|
||||||
- caddy
|
- caddy
|
||||||
appends: yes
|
appends: yes
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
---
|
---
|
||||||
- getent:
|
- name: Look up the Node-RED user
|
||||||
|
getent:
|
||||||
database: passwd
|
database: passwd
|
||||||
key: "{{ nodered_user }}"
|
key: "{{ nodered_user }}"
|
||||||
split: ":"
|
split: ":"
|
||||||
|
|||||||
@@ -24,4 +24,4 @@ grafana_user: "{{ user }}"
|
|||||||
|
|
||||||
host: iot.tanshu.com
|
host: iot.tanshu.com
|
||||||
|
|
||||||
docker_network: iot_net
|
docker_network: iot_net
|
||||||
@@ -21,4 +21,3 @@
|
|||||||
restart_policy: "unless-stopped"
|
restart_policy: "unless-stopped"
|
||||||
published_ports:
|
published_ports:
|
||||||
- 5672:5672
|
- 5672:5672
|
||||||
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
---
|
---
|
||||||
container_name: rabbit
|
container_name: rabbit
|
||||||
image_name: rabbitmq:alpine
|
image_name: rabbitmq:alpine
|
||||||
|
|
||||||
@@ -4,4 +4,4 @@
|
|||||||
docker_container:
|
docker_container:
|
||||||
name: "{{ caddy_container }}"
|
name: "{{ caddy_container }}"
|
||||||
state: started
|
state: started
|
||||||
restart: true
|
restart: true
|
||||||
@@ -19,4 +19,4 @@
|
|||||||
block: "{{ snippet_block }}"
|
block: "{{ snippet_block }}"
|
||||||
create: yes
|
create: yes
|
||||||
when: not snippet_present
|
when: not snippet_present
|
||||||
notify: Restart caddy container
|
notify: Restart caddy container
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
dest: "/var/lib/{{ host_directory }}/training-data/eng.traineddata"
|
dest: "/var/lib/{{ host_directory }}/training-data/eng.traineddata"
|
||||||
mode: '0644'
|
mode: '0644'
|
||||||
when: not traineddata.stat.exists
|
when: not traineddata.stat.exists
|
||||||
|
|
||||||
- name: Create Stirling-PDF container
|
- name: Create Stirling-PDF container
|
||||||
docker_container:
|
docker_container:
|
||||||
name: "{{ container }}"
|
name: "{{ container }}"
|
||||||
@@ -46,4 +46,4 @@
|
|||||||
- "/var/lib/{{ host_directory }}/training-data:/usr/share/tessdata"
|
- "/var/lib/{{ host_directory }}/training-data:/usr/share/tessdata"
|
||||||
- "/var/lib/{{ host_directory }}/extra-configs:/configs"
|
- "/var/lib/{{ host_directory }}/extra-configs:/configs"
|
||||||
- "/var/lib/{{ host_directory }}/logs:/logs"
|
- "/var/lib/{{ host_directory }}/logs:/logs"
|
||||||
- "/var/lib/{{ host_directory }}/custom-files:/customFiles"
|
- "/var/lib/{{ host_directory }}/custom-files:/customFiles"
|
||||||
@@ -6,4 +6,4 @@ container: stirling-pdf
|
|||||||
image: frooodle/s-pdf:latest
|
image: frooodle/s-pdf:latest
|
||||||
|
|
||||||
host_directory: stirling-pdf
|
host_directory: stirling-pdf
|
||||||
host_port: 8002
|
host_port: 8002
|
||||||
@@ -56,4 +56,3 @@
|
|||||||
service:
|
service:
|
||||||
name: nginx
|
name: nginx
|
||||||
state: reloaded
|
state: reloaded
|
||||||
|
|
||||||
Reference in new issue
Block a user