diff --git a/ansible/group_vars/all/user.yml b/ansible/group_vars/all/user.yml index 28cc9ed..0acf835 100644 --- a/ansible/group_vars/all/user.yml +++ b/ansible/group_vars/all/user.yml @@ -1,2 +1,2 @@ user: jake -home: "/home/{{ user }}" +home: /home/{{ user }} diff --git a/ansible/group_vars/all/wireguard.yml b/ansible/group_vars/all/wireguard.yml index 86f0e64..ac31893 100644 --- a/ansible/group_vars/all/wireguard.yml +++ b/ansible/group_vars/all/wireguard.yml @@ -1,9 +1,9 @@ wireguard: public_ip: "{{ hosts.casey_ip }}" port: 51820 - cidr: "10.23.0.0/24" + cidr: 10.23.0.0/24 server: - ip: "10.23.0.1" + ip: 10.23.0.1 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 38663861323433663733306266313862383538613562616531656262616665393130626564666539 @@ -22,7 +22,7 @@ wireguard: 6432363064313239656338356630626235336239356662326362 clients: big-mike: - ip: "10.23.0.11" + ip: 10.23.0.11 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 37313230386134346632363731356132656634303330363662613538336638346538373366343863 @@ -40,7 +40,7 @@ wireguard: 30623234306161313939363938333833353433366130306162633939663462313431383433643666 3736343161363735623964633362353939303133643439373138 intersect: - ip: "10.23.0.2" + ip: 10.23.0.2 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 36376136643534323433666161366363646630393165326264633266383535396362613461326631 @@ -58,7 +58,7 @@ wireguard: 31366135353861313064343562353163326238373630346631613734303732666235613332653431 3866663137353330666539373861633836303839386331363366 bartowski: - ip: "10.23.0.23" + ip: 10.23.0.23 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 65636435336562653438363866663238353065303132383633613539633738303461303838313332 @@ -76,7 +76,7 @@ wireguard: 61623763306665636361643664383566373861363037386664626638666566623034633134626465 3831666130333133636536633539346431613863623330326430 roark: - ip: "10.23.0.22" + ip: 10.23.0.22 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 65326261643165633130663436386230346166373962333738633535616165396238393862313565 @@ -94,7 +94,7 @@ wireguard: 31386162316632373532323732643232323062646365643539306361666332306537663639383737 3466633363373566636335376132633439306562323161653764 too-work: - ip: "10.23.0.12" + ip: 10.23.0.12 public_key: !vault | $ANSIBLE_VAULT;1.1;AES256 30373835313966343962643864363333383537303964316234373031643635343231316264303034 diff --git a/ansible/roles/base/tasks/packages.yml b/ansible/roles/base/tasks/packages.yml index 860c0be..4896201 100644 --- a/ansible/roles/base/tasks/packages.yml +++ b/ansible/roles/base/tasks/packages.yml @@ -1,4 +1,4 @@ -- name: "Install Base Packages" +- name: Install Base Packages apt: name: "{{ item }}" become: true diff --git a/ansible/roles/docker/files/gitea/docker-compose.yml b/ansible/roles/docker/files/gitea/docker-compose.yml index 0bad515..e6b2138 100644 --- a/ansible/roles/docker/files/gitea/docker-compose.yml +++ b/ansible/roles/docker/files/gitea/docker-compose.yml @@ -53,7 +53,7 @@ services: gitea-cgit-adapter: image: theorangeone/gitea-cgit-adapter:latest restart: unless-stopped - command: "/app/gitea-cgit-adapter /etc/gitea.ini /etc/cgit-repos.txt --interval 600" + command: /app/gitea-cgit-adapter /etc/gitea.ini /etc/cgit-repos.txt --interval 600 depends_on: - gitea volumes: diff --git a/ansible/roles/docker/files/netdata/docker-compose.yml b/ansible/roles/docker/files/netdata/docker-compose.yml index f685a26..7c72c40 100644 --- a/ansible/roles/docker/files/netdata/docker-compose.yml +++ b/ansible/roles/docker/files/netdata/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: "2.3" services: netdata: diff --git a/ansible/roles/docker/files/portainer/docker-compose.yml b/ansible/roles/docker/files/portainer/docker-compose.yml index f9f23c8..0ced700 100644 --- a/ansible/roles/docker/files/portainer/docker-compose.yml +++ b/ansible/roles/docker/files/portainer/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: "2.3" services: portainer: diff --git a/ansible/roles/docker/files/statping/docker-compose.yml b/ansible/roles/docker/files/statping/docker-compose.yml index 3de5080..da7f4ed 100644 --- a/ansible/roles/docker/files/statping/docker-compose.yml +++ b/ansible/roles/docker/files/statping/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: "2.3" services: statping: diff --git a/ansible/roles/docker/files/synapse/docker-compose.yml b/ansible/roles/docker/files/synapse/docker-compose.yml index deb602e..f25ca2f 100644 --- a/ansible/roles/docker/files/synapse/docker-compose.yml +++ b/ansible/roles/docker/files/synapse/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: "2.3" services: diff --git a/ansible/roles/docker/files/synapse/homeserver.yml b/ansible/roles/docker/files/synapse/homeserver.yml index bb7e4c0..700bd0d 100644 --- a/ansible/roles/docker/files/synapse/homeserver.yml +++ b/ansible/roles/docker/files/synapse/homeserver.yml @@ -7,7 +7,7 @@ # e.g. matrix.org, localhost:8080, etc. # This is also the last part of your UserID. # -server_name: "theorangeone.net" +server_name: theorangeone.net # When running as a daemon, the file to store the pid in # @@ -524,7 +524,7 @@ acme: database: # The database engine name - name: "psycopg2" + name: psycopg2 # Arguments to pass to the engine args: user: synapse @@ -543,7 +543,7 @@ database: # A yaml python logging config file as described by # https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema # -log_config: "/data/theorangeone.net.log.config" +log_config: /data/theorangeone.net.log.config ## Ratelimiting ## @@ -635,7 +635,7 @@ log_config: "/data/theorangeone.net.log.config" # Directory where uploaded images and attachments are stored. # -media_store_path: "/data/media_store" +media_store_path: /data/media_store # Media storage providers allow media to be stored in different # locations. @@ -654,7 +654,7 @@ media_store_path: "/data/media_store" # Directory where in-progress uploads are stored. # -uploads_path: "/data/uploads" +uploads_path: /data/uploads # The largest allowed upload size in bytes # @@ -1076,7 +1076,7 @@ form_secret: "{{ synapse.form_secret }}" # Path to the signing key to sign messages with # -signing_key_path: "/data/theorangeone.net.signing.key" +signing_key_path: /data/theorangeone.net.signing.key # The keys that the server used to sign messages with but won't use # to sign new messages. E.g. it has lost its private key @@ -1135,7 +1135,7 @@ signing_key_path: "/data/theorangeone.net.signing.key" # - server_name: "my_other_trusted_server.example.com" # trusted_key_servers: - - server_name: "matrix.org" + - server_name: matrix.org # Uncomment the following to disable the warning that is emitted when the # trusted_key_servers include 'matrix.org'. See above. diff --git a/ansible/roles/docker/files/todoist-github/docker-compose.yml b/ansible/roles/docker/files/todoist-github/docker-compose.yml index e42e04c..a402799 100644 --- a/ansible/roles/docker/files/todoist-github/docker-compose.yml +++ b/ansible/roles/docker/files/todoist-github/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: "2.3" services: todoist-github: diff --git a/ansible/roles/docker/files/traefik/file-provider.yml b/ansible/roles/docker/files/traefik/file-provider.yml index ac29ca7..b4d7767 100644 --- a/ansible/roles/docker/files/traefik/file-provider.yml +++ b/ansible/roles/docker/files/traefik/file-provider.yml @@ -12,30 +12,30 @@ http: routers: hsts: - service: "ping@internal" - rule: "PathPrefix(`/`)" + service: ping@internal + rule: PathPrefix(`/`) entryPoints: - web middlewares: - hsts ping: - service: "ping@internal" - rule: "Host(`traefik.jakehoward.tech`) && Path(`/ping/`)" + service: ping@internal + rule: Host(`traefik.jakehoward.tech`) && Path(`/ping/`) middlewares: - hsts tls: certResolver: le dashboard: - service: "dashboard@internal" - rule: "Host(`traefik.jakehoward.tech`)" + service: dashboard@internal + rule: Host(`traefik.jakehoward.tech`) middlewares: - hsts - internal-only tls: certResolver: le api: - service: "api@internal" - rule: "Host(`traefik.jakehoward.tech`) && PathPrefix(`/api`)" + service: api@internal + rule: Host(`traefik.jakehoward.tech`) && PathPrefix(`/api`) middlewares: - hsts - internal-only diff --git a/ansible/roles/docker/files/traefik/traefik.yml b/ansible/roles/docker/files/traefik/traefik.yml index 7defbd5..9f2b718 100644 --- a/ansible/roles/docker/files/traefik/traefik.yml +++ b/ansible/roles/docker/files/traefik/traefik.yml @@ -20,7 +20,7 @@ ping: providers: docker: - endpoint: "unix:///var/run/docker.sock" + endpoint: unix:///var/run/docker.sock watch: true exposedByDefault: false file: @@ -32,7 +32,7 @@ api: certificatesResolvers: le: acme: - email: "hosting@theorangeone.net" - storage: "/etc/traefik/acme.json" + email: hosting@theorangeone.net + storage: /etc/traefik/acme.json httpChallenge: entryPoint: web diff --git a/ansible/roles/docker/tasks/calibre.yml b/ansible/roles/docker/tasks/calibre.yml index 44eb0d0..5a62350 100644 --- a/ansible/roles/docker/tasks/calibre.yml +++ b/ansible/roles/docker/tasks/calibre.yml @@ -1,6 +1,6 @@ - name: Create calibre directory file: - path: '/opt/calibre' + path: /opt/calibre state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install calibre compose file template: src: files/calibre/docker-compose.yml - dest: "/opt/calibre/docker-compose.yml" + dest: /opt/calibre/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/duplicati.yml b/ansible/roles/docker/tasks/duplicati.yml index 09e4d61..92dd43e 100644 --- a/ansible/roles/docker/tasks/duplicati.yml +++ b/ansible/roles/docker/tasks/duplicati.yml @@ -1,6 +1,6 @@ - name: Create duplicati directory file: - path: '/opt/duplicati' + path: /opt/duplicati state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install duplicati compose file template: src: files/duplicati/docker-compose.yml - dest: "/opt/duplicati/docker-compose.yml" + dest: /opt/duplicati/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/emby.yml b/ansible/roles/docker/tasks/emby.yml index c961220..0a4e85d 100644 --- a/ansible/roles/docker/tasks/emby.yml +++ b/ansible/roles/docker/tasks/emby.yml @@ -1,6 +1,6 @@ - name: Create emby directory file: - path: '/opt/emby' + path: /opt/emby state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install emby compose file template: src: files/emby/docker-compose.yml - dest: "/opt/emby/docker-compose.yml" + dest: /opt/emby/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/folding-at-home.yml b/ansible/roles/docker/tasks/folding-at-home.yml index cecf036..112134b 100644 --- a/ansible/roles/docker/tasks/folding-at-home.yml +++ b/ansible/roles/docker/tasks/folding-at-home.yml @@ -3,7 +3,7 @@ - name: Create foh directory file: - path: '/opt/foh' + path: /opt/foh state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install foh compose file template: src: files/folding-at-home/docker-compose.yml - dest: "/opt/foh/docker-compose.yml" + dest: /opt/foh/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/gitea.yml b/ansible/roles/docker/tasks/gitea.yml index ecde854..12cadd0 100644 --- a/ansible/roles/docker/tasks/gitea.yml +++ b/ansible/roles/docker/tasks/gitea.yml @@ -3,7 +3,7 @@ - name: Create gitea directory file: - path: '/opt/gitea' + path: /opt/gitea state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -11,14 +11,14 @@ - name: Create gitea config directory file: - path: '/opt/gitea/gitea/gitea/conf' + path: /opt/gitea/gitea/gitea/conf state: directory mode: "{{ docker_compose_directory_mask }}" become: true - name: Create cgit config directory file: - path: '/opt/gitea/cgit' + path: /opt/gitea/cgit state: directory mode: "{{ docker_compose_directory_mask }}" become: true @@ -26,7 +26,7 @@ - name: Install gitea compose file template: src: files/gitea/docker-compose.yml - dest: "/opt/gitea/docker-compose.yml" + dest: /opt/gitea/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -36,7 +36,7 @@ - name: Install gitea config file template: src: files/gitea/app.ini - dest: "/opt/gitea/gitea/gitea/conf/app.ini" + dest: /opt/gitea/gitea/gitea/conf/app.ini mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: gitea_config_file @@ -45,7 +45,7 @@ - name: Install cgit config file template: src: files/gitea/cgitrc - dest: "/opt/gitea/cgit/cgitrc" + dest: /opt/gitea/cgit/cgitrc mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: cgit_config_file diff --git a/ansible/roles/docker/tasks/gotify.yml b/ansible/roles/docker/tasks/gotify.yml index 278a1a9..d829821 100644 --- a/ansible/roles/docker/tasks/gotify.yml +++ b/ansible/roles/docker/tasks/gotify.yml @@ -1,6 +1,6 @@ - name: Create gotify directory file: - path: '/opt/gotify' + path: /opt/gotify state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install gotify compose file template: src: files/gotify/docker-compose.yml - dest: "/opt/gotify/docker-compose.yml" + dest: /opt/gotify/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/librespeed.yml b/ansible/roles/docker/tasks/librespeed.yml index 4be9f0e..35133f9 100644 --- a/ansible/roles/docker/tasks/librespeed.yml +++ b/ansible/roles/docker/tasks/librespeed.yml @@ -1,6 +1,6 @@ - name: Create librespeed directory file: - path: '/opt/librespeed' + path: /opt/librespeed state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install librespeed compose file template: src: files/librespeed/docker-compose.yml - dest: "/opt/librespeed/docker-compose.yml" + dest: /opt/librespeed/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/netdata.yml b/ansible/roles/docker/tasks/netdata.yml index 9a90554..0709123 100644 --- a/ansible/roles/docker/tasks/netdata.yml +++ b/ansible/roles/docker/tasks/netdata.yml @@ -1,6 +1,6 @@ - name: Create netdata directory file: - path: '/opt/netdata' + path: /opt/netdata state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install netdata compose file template: src: files/netdata/docker-compose.yml - dest: "/opt/netdata/docker-compose.yml" + dest: /opt/netdata/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/nextcloud.yml b/ansible/roles/docker/tasks/nextcloud.yml index acc1a7a..2662c69 100644 --- a/ansible/roles/docker/tasks/nextcloud.yml +++ b/ansible/roles/docker/tasks/nextcloud.yml @@ -3,7 +3,7 @@ - name: Create nextcloud directory file: - path: '/opt/nextcloud' + path: /opt/nextcloud state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install nextcloud compose file template: src: files/nextcloud/docker-compose.yml - dest: "/opt/nextcloud/docker-compose.yml" + dest: /opt/nextcloud/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -21,7 +21,7 @@ - name: Create nextcloud config directory file: - path: '/opt/nextcloud/nextcloud/config' + path: /opt/nextcloud/nextcloud/config state: directory mode: "{{ docker_compose_directory_mask }}" become: true @@ -29,7 +29,7 @@ - name: Install nextcloud config template: src: files/nextcloud/config.php - dest: "/opt/nextcloud/nextcloud/config/config.php" + dest: /opt/nextcloud/nextcloud/config/config.php mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: config_file @@ -38,7 +38,7 @@ - name: Install nextcloud custom nginx config template: src: files/nextcloud/default.conf - dest: "/opt/nextcloud/nextcloud/nginx-default.conf" + dest: /opt/nextcloud/nextcloud/nginx-default.conf mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: nginx_config diff --git a/ansible/roles/docker/tasks/pihole.yml b/ansible/roles/docker/tasks/pihole.yml index 1b2436b..3598d22 100644 --- a/ansible/roles/docker/tasks/pihole.yml +++ b/ansible/roles/docker/tasks/pihole.yml @@ -3,7 +3,7 @@ - name: Create pihole directory file: - path: '/opt/pihole' + path: /opt/pihole state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install pihole compose file template: src: files/pihole/docker-compose.yml - dest: "/opt/pihole/docker-compose.yml" + dest: /opt/pihole/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -21,7 +21,7 @@ - name: Create dnsmasq directory file: - path: '/opt/pihole/dnsmasq.d/' + path: /opt/pihole/dnsmasq.d/ state: directory mode: "{{ docker_compose_directory_mask }}" become: true @@ -29,7 +29,7 @@ - name: Install dnsmasq hosts config template: src: files/pihole/dnsmasq-vpn.conf - dest: "/opt/pihole/dnsmasq.d/02-vpn.conf" + dest: /opt/pihole/dnsmasq.d/02-vpn.conf mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: dnsmasq_vpn_hosts diff --git a/ansible/roles/docker/tasks/portainer.yml b/ansible/roles/docker/tasks/portainer.yml index 76b17f2..6a330f2 100644 --- a/ansible/roles/docker/tasks/portainer.yml +++ b/ansible/roles/docker/tasks/portainer.yml @@ -1,6 +1,6 @@ - name: Create portainer directory file: - path: '/opt/portainer' + path: /opt/portainer state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install portainer compose file template: src: files/portainer/docker-compose.yml - dest: "/opt/portainer/docker-compose.yml" + dest: /opt/portainer/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/quassel.yml b/ansible/roles/docker/tasks/quassel.yml index 5c22a59..0233623 100644 --- a/ansible/roles/docker/tasks/quassel.yml +++ b/ansible/roles/docker/tasks/quassel.yml @@ -1,6 +1,6 @@ - name: Create quassel directory file: - path: '/opt/quassel' + path: /opt/quassel state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install quassel compose file template: src: files/quassel/docker-compose.yml - dest: "/opt/quassel/docker-compose.yml" + dest: /opt/quassel/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/setup-docker.yml b/ansible/roles/docker/tasks/setup-docker.yml index 7b9e86c..3331341 100644 --- a/ansible/roles/docker/tasks/setup-docker.yml +++ b/ansible/roles/docker/tasks/setup-docker.yml @@ -1,6 +1,6 @@ - name: Install docker-compose apt: - name: "docker-compose" + name: docker-compose become: true - name: Create docker user @@ -14,7 +14,7 @@ cron: name: clean up docker containers special_time: weekly - job: "docker system prune" + job: docker system prune - name: Install util scripts copy: diff --git a/ansible/roles/docker/tasks/statping.yml b/ansible/roles/docker/tasks/statping.yml index 22e32d6..993ee81 100644 --- a/ansible/roles/docker/tasks/statping.yml +++ b/ansible/roles/docker/tasks/statping.yml @@ -1,6 +1,6 @@ - name: Create statping directory file: - path: '/opt/statping' + path: /opt/statping state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install statping compose file template: src: files/statping/docker-compose.yml - dest: "/opt/statping/docker-compose.yml" + dest: /opt/statping/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/synapse.yml b/ansible/roles/docker/tasks/synapse.yml index 3c580b8..9fad625 100644 --- a/ansible/roles/docker/tasks/synapse.yml +++ b/ansible/roles/docker/tasks/synapse.yml @@ -3,7 +3,7 @@ - name: Create synapse directory file: - path: '/opt/synapse' + path: /opt/synapse state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install synapse compose file template: src: files/synapse/docker-compose.yml - dest: "/opt/synapse/docker-compose.yml" + dest: /opt/synapse/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -22,7 +22,7 @@ - name: Install synapse config template: src: files/synapse/homeserver.yml - dest: "/opt/synapse/homeserver.yaml" + dest: /opt/synapse/homeserver.yaml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: homeserver_config @@ -42,6 +42,6 @@ - name: Install helper scripts git: - repo: "https://github.com/xwiki-labs/synapse_scripts" + repo: https://github.com/xwiki-labs/synapse_scripts dest: /opt/synapse/synapse_scripts force: true diff --git a/ansible/roles/docker/tasks/todoist-github.yml b/ansible/roles/docker/tasks/todoist-github.yml index ebac584..a380972 100644 --- a/ansible/roles/docker/tasks/todoist-github.yml +++ b/ansible/roles/docker/tasks/todoist-github.yml @@ -3,7 +3,7 @@ - name: Create todoist-github directory file: - path: '/opt/todoist-github' + path: /opt/todoist-github state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install todoist-github compose file template: src: files/todoist-github/docker-compose.yml - dest: "/opt/todoist-github/docker-compose.yml" + dest: /opt/todoist-github/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/torrent.yml b/ansible/roles/docker/tasks/torrent.yml index ebd7635..ce38700 100644 --- a/ansible/roles/docker/tasks/torrent.yml +++ b/ansible/roles/docker/tasks/torrent.yml @@ -1,6 +1,6 @@ - name: Create torrent directory file: - path: '/opt/torrent' + path: /opt/torrent state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install torrent compose file template: src: files/torrent/docker-compose.yml - dest: "/opt/torrent/docker-compose.yml" + dest: /opt/torrent/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/traefik.yml b/ansible/roles/docker/tasks/traefik.yml index 5e6182c..e7a103e 100644 --- a/ansible/roles/docker/tasks/traefik.yml +++ b/ansible/roles/docker/tasks/traefik.yml @@ -1,6 +1,6 @@ - name: Create traefik directory file: - path: '/opt/traefik' + path: /opt/traefik state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -8,7 +8,7 @@ - name: Create traefik config directory file: - path: '/opt/traefik/traefik' + path: /opt/traefik/traefik state: directory mode: "{{ docker_compose_directory_mask }}" become: true @@ -16,7 +16,7 @@ - name: Install traefik compose file template: src: files/traefik/docker-compose.yml - dest: "/opt/traefik/docker-compose.yml" + dest: /opt/traefik/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -26,7 +26,7 @@ - name: Install traefik config template: src: files/traefik/traefik.yml - dest: "/opt/traefik/traefik/traefik.yml" + dest: /opt/traefik/traefik/traefik.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: config_file @@ -35,7 +35,7 @@ - name: Install traefik file provider template: src: files/traefik/file-provider.yml - dest: "/opt/traefik/traefik/file-provider.yml" + dest: /opt/traefik/traefik/file-provider.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: file_provider diff --git a/ansible/roles/docker/tasks/tt-rss.yml b/ansible/roles/docker/tasks/tt-rss.yml index 65769be..7a940d0 100644 --- a/ansible/roles/docker/tasks/tt-rss.yml +++ b/ansible/roles/docker/tasks/tt-rss.yml @@ -1,6 +1,6 @@ - name: Create tt-rss directory file: - path: '/opt/tt-rss' + path: /opt/tt-rss state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install tt-rss compose file template: src: files/tt-rss/docker-compose.yml - dest: "/opt/tt-rss/docker-compose.yml" + dest: /opt/tt-rss/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -18,7 +18,7 @@ - name: Create tt-rss config directory file: - path: '/opt/tt-rss/config' + path: /opt/tt-rss/config state: directory mode: "{{ docker_compose_directory_mask }}" become: true @@ -26,7 +26,7 @@ - name: Install tt-rss config template: src: files/tt-rss/config.php - dest: "/opt/tt-rss/config/config.php" + dest: /opt/tt-rss/config/config.php mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: config_file diff --git a/ansible/roles/docker/tasks/wallabag.yml b/ansible/roles/docker/tasks/wallabag.yml index 43c1787..698bb0b 100644 --- a/ansible/roles/docker/tasks/wallabag.yml +++ b/ansible/roles/docker/tasks/wallabag.yml @@ -3,7 +3,7 @@ - name: Create wallabag directory file: - path: '/opt/wallabag' + path: /opt/wallabag state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install wallabag compose file template: src: files/wallabag/docker-compose.yml - dest: "/opt/wallabag/docker-compose.yml" + dest: /opt/wallabag/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/watchtower.yml b/ansible/roles/docker/tasks/watchtower.yml index 831d4bc..6e33152 100644 --- a/ansible/roles/docker/tasks/watchtower.yml +++ b/ansible/roles/docker/tasks/watchtower.yml @@ -1,6 +1,6 @@ - name: Create watchtower directory file: - path: '/opt/watchtower' + path: /opt/watchtower state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install watchtower compose file template: src: files/watchtower/docker-compose.yml - dest: "/opt/watchtower/docker-compose.yml" + dest: /opt/watchtower/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/whoami.yml b/ansible/roles/docker/tasks/whoami.yml index bb208b1..7708846 100644 --- a/ansible/roles/docker/tasks/whoami.yml +++ b/ansible/roles/docker/tasks/whoami.yml @@ -1,6 +1,6 @@ - name: Create whoami directory file: - path: '/opt/whoami' + path: /opt/whoami state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -9,7 +9,7 @@ - name: Install whoami compose file template: src: files/whoami/docker-compose.yml - dest: "/opt/whoami/docker-compose.yml" + dest: /opt/whoami/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config diff --git a/ansible/roles/docker/tasks/yourls.yml b/ansible/roles/docker/tasks/yourls.yml index 43ae0d9..d013845 100644 --- a/ansible/roles/docker/tasks/yourls.yml +++ b/ansible/roles/docker/tasks/yourls.yml @@ -3,7 +3,7 @@ - name: Create yourls directory file: - path: '/opt/yourls' + path: /opt/yourls state: directory owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" @@ -12,7 +12,7 @@ - name: Install yourls compose file template: src: files/yourls/docker-compose.yml - dest: "/opt/yourls/docker-compose.yml" + dest: /opt/yourls/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" validate: /usr/bin/docker-compose -f %s config @@ -22,7 +22,7 @@ - name: Install yourls index template: src: files/yourls/index.html - dest: "/opt/yourls/index.html" + dest: /opt/yourls/index.html mode: "{{ docker_compose_file_mask }}" register: config_file become: true diff --git a/ansible/roles/gateway/tasks/wireguard.yml b/ansible/roles/gateway/tasks/wireguard.yml index 6d7c222..111dc77 100644 --- a/ansible/roles/gateway/tasks/wireguard.yml +++ b/ansible/roles/gateway/tasks/wireguard.yml @@ -2,7 +2,7 @@ lineinfile: path: /etc/apt/sources.list.d/unstable.list state: present - line: 'deb http://deb.debian.org/debian/ unstable main' + line: deb http://deb.debian.org/debian/ unstable main register: install_unstable_apt become: true diff --git a/dev-requirements.txt b/dev-requirements.txt index c8d215d..17178a5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,3 @@ -r requirements.txt ansible-lint==4.2.0 -yamllint==1.20.0 +yamllint==1.21.0 diff --git a/yamllint.yml b/yamllint.yml index 2a85bf4..08a7701 100644 --- a/yamllint.yml +++ b/yamllint.yml @@ -2,9 +2,13 @@ extends: default ignore: | galaxy_roles + ansible/group_vars/all/hosts.yml rules: document-start: "disable" truthy: "disable" + quoted-strings: + quote-type: double + required: only-when-needed line-length: max: 150