Commit 083e22de authored by Chris Croome's avatar Chris Croome

ansible-lint fixes

parent 5a991cab
Pipeline #5248 failed with stage
in 21 seconds
......@@ -11,11 +11,11 @@
nameserver_1: 81.95.52.30
nameserver_2: 81.95.52.27
# If this isn't defined or isn't set to True then Munin won't be configured for Docker
munin_node_install: True
munin_node_install: true
# The Docker Compose version from https://github.com/docker/compose/releases
# if this is undefined it won't be installed or upgraded, docker compose is
# not used or needed so docker_compose_version can be left commented out
#docker_compose_version: 1.22.0
# docker_compose_version: 1.22.0
roles:
- acmesh
......
---
- name: Install Prosody
hosts: "{{ hostname }}"
become: true
become: true
vars:
distro: stretch
......@@ -12,7 +12,7 @@
- "conference.{{ hostname }}"
- "public.{{ hostname }}"
# Don't get a ECC cert
ecc: False
ecc: false
# Empty variable to contain the subjectAltNames with DNS: prepended for checking aagainst existing certs
roles:
......
---
- name: Gather hardware facts
- name: Gather hardware facts
setup:
gather_subset:
- hardware
......@@ -11,7 +11,7 @@
- name: "Set a fact for the number of ClamAV threads based on a fifth of the number of CPUs rounded up to the nearest whole number"
set_fact:
nextcloud_clamav_threads: "{{ ( ansible_processor_vcpus * 0.2 ) | round(0, 'ceil') | int }}"
nextcloud_clamav_threads: "{{ ( ansible_processor_vcpus * 0.2 ) | round(0, 'ceil') | int }}"
- name: Print the max ClamAV threads
debug:
......@@ -29,14 +29,14 @@
template:
src: templates/clamd.conf.j2
dest: /etc/clamav/clamd.conf
backup: yes
backup: true
- name: Check if files_antivirus app is installed
command: "php occ config:app:get files_antivirus installed_version"
ignore_errors: True
args:
chdir: /var/www/nextcloud
become: yes
become: true
become_user: www-data
register: files_antivirus_installed_version
......@@ -45,7 +45,7 @@
args:
chdir: /var/www/nextcloud
executable: /bin/bash
become: yes
become: true
become_user: www-data
when: files_antivirus_installed_version.stdout == ""
......@@ -53,7 +53,7 @@
command: "php occ config:app:get files_antivirus enabled"
args:
chdir: /var/www/nextcloud
become: yes
become: true
become_user: www-data
register: files_antivirus_enabled
......@@ -62,7 +62,7 @@
args:
chdir: /var/www/nextcloud
executable: /bin/bash
become: yes
become: true
become_user: www-data
when: files_antivirus_enabled.stdout != "yes"
......
......@@ -66,17 +66,17 @@
- name: Get the running container ID
shell: docker ps | grep -v ^CONTAINER | awk '{ print $1 }'
register: nextcloud_collabora_docker_container_port
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
- name: Stop the Collabora container manually
command: "docker stop {{ nextcloud_collabora_docker_container_port.stdout }}"
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
- name: Pause before starting Collabora container
pause:
seconds: 60
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
when: ( nextcloud_collabora_docker_port.stdout is defined ) and ( nextcloud_collabora_docker_port.stdout == "9980/tcp:" )
- name: Start the Collabora container
docker_container:
name: collabora_online
......@@ -86,7 +86,7 @@
restart_policy: always
tty: true
ports:
- "127.0.0.1:9980:9980"
- "127.0.0.1:9980:9980"
env:
domain: "{{ hostname | regex_replace('\\.', '\\.') }}"
dictionaries: "en_GB en_US es_ES fr_FR de_DE"
......@@ -129,12 +129,12 @@
- name: Pause before restarting Docker container
pause:
seconds: 120
- name: Docker restarted
service:
name: docker
state: restarted
- name: Docker images pruned
command: docker image prune -f
......@@ -142,7 +142,7 @@
- name: Check if richdocuments app is installed
command: "php occ config:app:get richdocuments installed_version"
ignore_errors: True
ignore_errors: true
args:
chdir: /var/www/nextcloud
become: true
......@@ -179,7 +179,7 @@
chdir: /var/www/nextcloud
become: true
become_user: www-data
when: richdocuments_enabled.stdout == "no"
when: richdocuments_enabled.stdout == "no"
- name: Set the richdocuments wopi_url
command: 'php occ config:app:set richdocuments wopi_url --value="https://{{ common_name }}:443"'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment