diff --git a/ansible/dev-requirements.txt b/ansible/dev-requirements.txt index 3f7817d..d1348ea 100644 --- a/ansible/dev-requirements.txt +++ b/ansible/dev-requirements.txt @@ -1,2 +1,2 @@ -ansible-lint==4.2.0 +ansible-lint==4.3.5 yamllint==1.23.0 diff --git a/ansible/main.yml b/ansible/main.yml index 0ff10a0..7c5b0f0 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -23,7 +23,7 @@ docker_package: "{{ 'docker-ce' if ansible_os_family == 'Debian' else 'docker' }}" docker_users: - "{{ user }}" - - docker-cleanup + - docker_cleanup - watchtower - traefik @@ -37,8 +37,8 @@ - hosts: intersect roles: - netdata - - home-assistant - - intersect-docker + - home_assistant + - intersect_docker - plausible - duplicati - grafana @@ -52,4 +52,4 @@ - upload - website - duplicati - - gitlab-pages + - gitlab_pages diff --git a/ansible/roles/base/tasks/ssh.yml b/ansible/roles/base/tasks/ssh.yml index 8b14363..72b08d9 100644 --- a/ansible/roles/base/tasks/ssh.yml +++ b/ansible/roles/base/tasks/ssh.yml @@ -21,6 +21,7 @@ dest: /etc/ssh/sshd_config validate: /usr/sbin/sshd -t -f %s backup: yes + mode: 0644 become: true register: sshd_config diff --git a/ansible/roles/docker-cleanup/files/docker-utils/ctop b/ansible/roles/docker_cleanup/files/docker-utils/ctop similarity index 100% rename from ansible/roles/docker-cleanup/files/docker-utils/ctop rename to ansible/roles/docker_cleanup/files/docker-utils/ctop diff --git a/ansible/roles/docker-cleanup/files/docker-utils/dc b/ansible/roles/docker_cleanup/files/docker-utils/dc similarity index 100% rename from ansible/roles/docker-cleanup/files/docker-utils/dc rename to ansible/roles/docker_cleanup/files/docker-utils/dc diff --git a/ansible/roles/docker-cleanup/files/docker-utils/dc-all b/ansible/roles/docker_cleanup/files/docker-utils/dc-all similarity index 100% rename from ansible/roles/docker-cleanup/files/docker-utils/dc-all rename to ansible/roles/docker_cleanup/files/docker-utils/dc-all diff --git a/ansible/roles/docker-cleanup/files/docker-utils/hard-restart-all b/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all similarity index 100% rename from ansible/roles/docker-cleanup/files/docker-utils/hard-restart-all rename to ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all diff --git a/ansible/roles/docker-cleanup/files/docker-utils/occ b/ansible/roles/docker_cleanup/files/docker-utils/occ similarity index 100% rename from ansible/roles/docker-cleanup/files/docker-utils/occ rename to ansible/roles/docker_cleanup/files/docker-utils/occ diff --git a/ansible/roles/docker-cleanup/tasks/main.yml b/ansible/roles/docker_cleanup/tasks/main.yml similarity index 100% rename from ansible/roles/docker-cleanup/tasks/main.yml rename to ansible/roles/docker_cleanup/tasks/main.yml diff --git a/ansible/roles/gateway/tasks/haproxy.yml b/ansible/roles/gateway/tasks/haproxy.yml index c862b43..20035dc 100644 --- a/ansible/roles/gateway/tasks/haproxy.yml +++ b/ansible/roles/gateway/tasks/haproxy.yml @@ -8,6 +8,7 @@ src: files/haproxy.cfg dest: /etc/haproxy/haproxy.cfg validate: /usr/sbin/haproxy -c -- %s + mode: "0644" backup: yes become: true register: haproxy_config diff --git a/ansible/roles/gateway/tasks/wireguard.yml b/ansible/roles/gateway/tasks/wireguard.yml index c22900b..e5da01d 100644 --- a/ansible/roles/gateway/tasks/wireguard.yml +++ b/ansible/roles/gateway/tasks/wireguard.yml @@ -2,6 +2,7 @@ template: src: files/wireguard-server.conf dest: /etc/wireguard/wg0.conf + mode: "0600" backup: yes become: true register: wireguard_conf diff --git a/ansible/roles/gitlab-pages/files/docker-compose.yml b/ansible/roles/gitlab_pages/files/docker-compose.yml similarity index 100% rename from ansible/roles/gitlab-pages/files/docker-compose.yml rename to ansible/roles/gitlab_pages/files/docker-compose.yml diff --git a/ansible/roles/gitlab-pages/files/gitlab.rb b/ansible/roles/gitlab_pages/files/gitlab.rb similarity index 100% rename from ansible/roles/gitlab-pages/files/gitlab.rb rename to ansible/roles/gitlab_pages/files/gitlab.rb diff --git a/ansible/roles/gitlab-pages/files/install-rsync.sh b/ansible/roles/gitlab_pages/files/install-rsync.sh similarity index 100% rename from ansible/roles/gitlab-pages/files/install-rsync.sh rename to ansible/roles/gitlab_pages/files/install-rsync.sh diff --git a/ansible/roles/gitlab-pages/handlers/main.yml b/ansible/roles/gitlab_pages/handlers/main.yml similarity index 100% rename from ansible/roles/gitlab-pages/handlers/main.yml rename to ansible/roles/gitlab_pages/handlers/main.yml diff --git a/ansible/roles/gitlab-pages/tasks/main.yml b/ansible/roles/gitlab_pages/tasks/main.yml similarity index 100% rename from ansible/roles/gitlab-pages/tasks/main.yml rename to ansible/roles/gitlab_pages/tasks/main.yml diff --git a/ansible/roles/home-assistant/files/configuration.yml b/ansible/roles/home_assistant/files/configuration.yml similarity index 100% rename from ansible/roles/home-assistant/files/configuration.yml rename to ansible/roles/home_assistant/files/configuration.yml diff --git a/ansible/roles/home-assistant/files/docker-compose.yml b/ansible/roles/home_assistant/files/docker-compose.yml similarity index 100% rename from ansible/roles/home-assistant/files/docker-compose.yml rename to ansible/roles/home_assistant/files/docker-compose.yml diff --git a/ansible/roles/home-assistant/handlers/main.yml b/ansible/roles/home_assistant/handlers/main.yml similarity index 100% rename from ansible/roles/home-assistant/handlers/main.yml rename to ansible/roles/home_assistant/handlers/main.yml diff --git a/ansible/roles/home-assistant/tasks/main.yml b/ansible/roles/home_assistant/tasks/main.yml similarity index 100% rename from ansible/roles/home-assistant/tasks/main.yml rename to ansible/roles/home_assistant/tasks/main.yml diff --git a/ansible/roles/intersect-docker/files/calibre/docker-compose.yml b/ansible/roles/intersect_docker/files/calibre/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/calibre/docker-compose.yml rename to ansible/roles/intersect_docker/files/calibre/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/gotify/docker-compose.yml b/ansible/roles/intersect_docker/files/gotify/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/gotify/docker-compose.yml rename to ansible/roles/intersect_docker/files/gotify/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml b/ansible/roles/intersect_docker/files/jellyfin/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml rename to ansible/roles/intersect_docker/files/jellyfin/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/librespeed/docker-compose.yml b/ansible/roles/intersect_docker/files/librespeed/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/librespeed/docker-compose.yml rename to ansible/roles/intersect_docker/files/librespeed/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/nextcloud/config.php b/ansible/roles/intersect_docker/files/nextcloud/config.php similarity index 100% rename from ansible/roles/intersect-docker/files/nextcloud/config.php rename to ansible/roles/intersect_docker/files/nextcloud/config.php diff --git a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml b/ansible/roles/intersect_docker/files/nextcloud/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml rename to ansible/roles/intersect_docker/files/nextcloud/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/quassel/docker-compose.yml b/ansible/roles/intersect_docker/files/quassel/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/quassel/docker-compose.yml rename to ansible/roles/intersect_docker/files/quassel/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/synapse/docker-compose.yml b/ansible/roles/intersect_docker/files/synapse/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/synapse/docker-compose.yml rename to ansible/roles/intersect_docker/files/synapse/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/synapse/homeserver.yml b/ansible/roles/intersect_docker/files/synapse/homeserver.yml similarity index 100% rename from ansible/roles/intersect-docker/files/synapse/homeserver.yml rename to ansible/roles/intersect_docker/files/synapse/homeserver.yml diff --git a/ansible/roles/intersect-docker/files/torrent/docker-compose.yml b/ansible/roles/intersect_docker/files/torrent/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/torrent/docker-compose.yml rename to ansible/roles/intersect_docker/files/torrent/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/tt-rss/config.php b/ansible/roles/intersect_docker/files/tt-rss/config.php similarity index 100% rename from ansible/roles/intersect-docker/files/tt-rss/config.php rename to ansible/roles/intersect_docker/files/tt-rss/config.php diff --git a/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml b/ansible/roles/intersect_docker/files/tt-rss/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml rename to ansible/roles/intersect_docker/files/tt-rss/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/wallabag/docker-compose.yml b/ansible/roles/intersect_docker/files/wallabag/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/wallabag/docker-compose.yml rename to ansible/roles/intersect_docker/files/wallabag/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/web-rng/docker-compose.yml b/ansible/roles/intersect_docker/files/web-rng/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/web-rng/docker-compose.yml rename to ansible/roles/intersect_docker/files/web-rng/docker-compose.yml diff --git a/ansible/roles/intersect-docker/files/whoami/docker-compose.yml b/ansible/roles/intersect_docker/files/whoami/docker-compose.yml similarity index 100% rename from ansible/roles/intersect-docker/files/whoami/docker-compose.yml rename to ansible/roles/intersect_docker/files/whoami/docker-compose.yml diff --git a/ansible/roles/intersect-docker/tasks/calibre.yml b/ansible/roles/intersect_docker/tasks/calibre.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/calibre.yml rename to ansible/roles/intersect_docker/tasks/calibre.yml diff --git a/ansible/roles/intersect-docker/tasks/gotify.yml b/ansible/roles/intersect_docker/tasks/gotify.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/gotify.yml rename to ansible/roles/intersect_docker/tasks/gotify.yml diff --git a/ansible/roles/intersect-docker/tasks/jellyfin.yml b/ansible/roles/intersect_docker/tasks/jellyfin.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/jellyfin.yml rename to ansible/roles/intersect_docker/tasks/jellyfin.yml diff --git a/ansible/roles/intersect-docker/tasks/librespeed.yml b/ansible/roles/intersect_docker/tasks/librespeed.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/librespeed.yml rename to ansible/roles/intersect_docker/tasks/librespeed.yml diff --git a/ansible/roles/intersect-docker/tasks/main.yml b/ansible/roles/intersect_docker/tasks/main.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/main.yml rename to ansible/roles/intersect_docker/tasks/main.yml diff --git a/ansible/roles/intersect-docker/tasks/nextcloud.yml b/ansible/roles/intersect_docker/tasks/nextcloud.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/nextcloud.yml rename to ansible/roles/intersect_docker/tasks/nextcloud.yml diff --git a/ansible/roles/intersect-docker/tasks/quassel.yml b/ansible/roles/intersect_docker/tasks/quassel.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/quassel.yml rename to ansible/roles/intersect_docker/tasks/quassel.yml diff --git a/ansible/roles/intersect-docker/tasks/synapse.yml b/ansible/roles/intersect_docker/tasks/synapse.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/synapse.yml rename to ansible/roles/intersect_docker/tasks/synapse.yml diff --git a/ansible/roles/intersect-docker/tasks/torrent.yml b/ansible/roles/intersect_docker/tasks/torrent.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/torrent.yml rename to ansible/roles/intersect_docker/tasks/torrent.yml diff --git a/ansible/roles/intersect-docker/tasks/tt-rss.yml b/ansible/roles/intersect_docker/tasks/tt-rss.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/tt-rss.yml rename to ansible/roles/intersect_docker/tasks/tt-rss.yml diff --git a/ansible/roles/intersect-docker/tasks/wallabag.yml b/ansible/roles/intersect_docker/tasks/wallabag.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/wallabag.yml rename to ansible/roles/intersect_docker/tasks/wallabag.yml diff --git a/ansible/roles/intersect-docker/tasks/web-rng.yml b/ansible/roles/intersect_docker/tasks/web-rng.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/web-rng.yml rename to ansible/roles/intersect_docker/tasks/web-rng.yml diff --git a/ansible/roles/intersect-docker/tasks/whoami.yml b/ansible/roles/intersect_docker/tasks/whoami.yml similarity index 100% rename from ansible/roles/intersect-docker/tasks/whoami.yml rename to ansible/roles/intersect_docker/tasks/whoami.yml diff --git a/ansible/roles/intersect-docker/vars/librespeed.yml b/ansible/roles/intersect_docker/vars/librespeed.yml similarity index 100% rename from ansible/roles/intersect-docker/vars/librespeed.yml rename to ansible/roles/intersect_docker/vars/librespeed.yml diff --git a/ansible/roles/intersect-docker/vars/nextcloud.yml b/ansible/roles/intersect_docker/vars/nextcloud.yml similarity index 100% rename from ansible/roles/intersect-docker/vars/nextcloud.yml rename to ansible/roles/intersect_docker/vars/nextcloud.yml diff --git a/ansible/roles/intersect-docker/vars/synapse.yml b/ansible/roles/intersect_docker/vars/synapse.yml similarity index 100% rename from ansible/roles/intersect-docker/vars/synapse.yml rename to ansible/roles/intersect_docker/vars/synapse.yml diff --git a/ansible/roles/intersect-docker/vars/wallabag.yml b/ansible/roles/intersect_docker/vars/wallabag.yml similarity index 100% rename from ansible/roles/intersect-docker/vars/wallabag.yml rename to ansible/roles/intersect_docker/vars/wallabag.yml diff --git a/ansible/roles/plausible/tasks/main.yml b/ansible/roles/plausible/tasks/main.yml index 93f126d..cbbc30c 100644 --- a/ansible/roles/plausible/tasks/main.yml +++ b/ansible/roles/plausible/tasks/main.yml @@ -10,6 +10,7 @@ template: src: files/clickhouse-config.xml dest: /mnt/tank/dbs/clickhouse/docker_related_config.xml + mode: "0644" notify: restart plausible become: true @@ -17,6 +18,7 @@ template: src: files/clickhouse-user-config.xml dest: /mnt/tank/dbs/clickhouse/docker_related_user_config.xml + mode: "0644" notify: restart plausible become: true diff --git a/ansible/roles/zfs/tasks/sanoid.yml b/ansible/roles/zfs/tasks/sanoid.yml index 9218997..31cae6f 100644 --- a/ansible/roles/zfs/tasks/sanoid.yml +++ b/ansible/roles/zfs/tasks/sanoid.yml @@ -33,6 +33,7 @@ file: path: /etc/sanoid state: directory + mode: "0755" become: true - name: Install default config @@ -58,6 +59,7 @@ template: src: files/sanoid.conf dest: /etc/sanoid/sanoid.conf + mode: "0755" become: true - name: Install cron job