From 77cf4d9c90eba8f7608f40e0eab3e574d5c3832e Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Tue, 5 Nov 2019 05:07:39 +0100 Subject: [PATCH] Remove unecessary role dependencies --- playbook.yml | 59 ++++++++++++-------------- roles/arch-mirror-docker/meta/main.yml | 2 - roles/base/README.md | 3 -- roles/base/tasks/main.yml | 18 ++++---- roles/ddns-docker/meta/main.yml | 2 - roles/docker/tasks/main.yml | 1 - roles/emby-docker/meta/main.yml | 2 - roles/gitlab-docker/meta/main.yml | 2 - roles/mailu-docker/meta/main.yml | 2 - roles/matrix-docker/meta/main.yml | 2 - roles/nextcloud-docker/meta/main.yml | 2 - roles/scripts/templates/syncData.sh | 4 -- roles/searx-docker/meta/main.yml | 2 - roles/torrent-docker/meta/main.yml | 2 - roles/wiki-docker/meta/main.yml | 2 - 15 files changed, 38 insertions(+), 67 deletions(-) delete mode 100644 roles/arch-mirror-docker/meta/main.yml delete mode 100644 roles/base/README.md delete mode 100644 roles/ddns-docker/meta/main.yml delete mode 100644 roles/emby-docker/meta/main.yml delete mode 100644 roles/gitlab-docker/meta/main.yml delete mode 100644 roles/mailu-docker/meta/main.yml delete mode 100644 roles/matrix-docker/meta/main.yml delete mode 100644 roles/nextcloud-docker/meta/main.yml delete mode 100644 roles/searx-docker/meta/main.yml delete mode 100644 roles/torrent-docker/meta/main.yml delete mode 100644 roles/wiki-docker/meta/main.yml diff --git a/playbook.yml b/playbook.yml index 3ce8eea..286bb0b 100644 --- a/playbook.yml +++ b/playbook.yml @@ -8,42 +8,39 @@ sub_domains: - rpg roles: - - { role: base, tags: ['base'] } - - { role: scripts, tags: [ 'scripts' ] } - - { role: daily-backup, tags: [ 'backup' ] } - - { role: docker, tags: [ 'docker' ] } - - { role: murmur-docker, tags: [ 'murmur' ] } - - { role: searx-docker, tags: [ 'searx' ] } - - { role: wiki-docker, tags: [ 'wiki' ] } - - { role: emby-docker, tags: [ 'emby' ] } - - { role: gitlab-docker, tags: [ 'gitlab' ] } - - { role: nextcloud-docker, tags: [ 'nextcloud' ] } - - { role: matrix-docker, tags: [ 'matrix' ] } - - { role: torrent-docker, tags: [ 'torrent' ] } - - { role: monit, tags: [ 'monit' ] } - - { role: stb-wordpress-docker, tags: [ 'stb' ] } - - { role: invidious-docker, tags: [ 'invidious' ] } - - { role: traefik-proxy-docker, tags: [ 'traefik' ] } - - { role: ddns-docker, tags: [ 'ddns' ] } - - role: mailu-docker - tags: [ 'mailu' ] - -- hosts: mail - become: true - vars: - docker_compose_files_folder_previous_server: /etc/compose - docker_compose_files_folder: /etc/compose - domain_name: banditlair.com - sub_domains: - - rpg - roles: + - role: base + tags: ['base'] - role: scripts tags: [ 'scripts' ] - role: daily-backup tags: [ 'backup' ] - role: docker tags: [ 'docker' ] - - role: mailu-docker - tags: [ 'mailu' ] - role: traefik-proxy-docker tags: [ 'traefik' ] + - role: murmur-docker + tags: [ 'murmur' ] + - role: searx-docker + tags: [ 'searx' ] + - role: wiki-docker + tags: [ 'wiki' ] + - role: emby-docker + tags: [ 'emby' ] + - role: gitlab-docker + tags: [ 'gitlab' ] + - role: nextcloud-docker + tags: [ 'nextcloud' ] + - role: matrix-docker + tags: [ 'matrix' ] + - role: torrent-docker + tags: [ 'torrent' ] + - role: monit + tags: [ 'monit' ] + - role: stb-wordpress-docker + tags: [ 'stb' ] + - role: invidious-docker + tags: [ 'invidious' ] + - role: ddns-docker + tags: [ 'ddns' ] + - role: mailu-docker + tags: [ 'mailu' ] diff --git a/roles/arch-mirror-docker/meta/main.yml b/roles/arch-mirror-docker/meta/main.yml deleted file mode 100644 index ee509d6..0000000 --- a/roles/arch-mirror-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker diff --git a/roles/base/README.md b/roles/base/README.md deleted file mode 100644 index e53b001..0000000 --- a/roles/base/README.md +++ /dev/null @@ -1,3 +0,0 @@ -base -==== -Installs Ansible prerequisites if needed and then installs basic utility packages diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 5f5189a..86d7332 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -1,10 +1,12 @@ --- - name: Install base packages - package: name={{item}} state=present update_cache=yes - with_items: - - htop - - git - - nload - - ufw - - borgbackup - + package: + name: + - htop + - git + - nload + - ufw + - borgbackup + - vim + state: present + update_cache: yes diff --git a/roles/ddns-docker/meta/main.yml b/roles/ddns-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/ddns-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 0baa57c..a1dc8b1 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -78,7 +78,6 @@ retries: 3 until: result is success - - name: Install docker-compose package dependencies apt: state: latest diff --git a/roles/emby-docker/meta/main.yml b/roles/emby-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/emby-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/gitlab-docker/meta/main.yml b/roles/gitlab-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/gitlab-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/mailu-docker/meta/main.yml b/roles/mailu-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/mailu-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/matrix-docker/meta/main.yml b/roles/matrix-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/matrix-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/nextcloud-docker/meta/main.yml b/roles/nextcloud-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/nextcloud-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/scripts/templates/syncData.sh b/roles/scripts/templates/syncData.sh index c45cc79..dc67344 100644 --- a/roles/scripts/templates/syncData.sh +++ b/roles/scripts/templates/syncData.sh @@ -4,7 +4,6 @@ set -e SOURCE_HOST=5.9.66.49 -{% if inventory_hostname in (groups['storage']) %} #Sync Media rsync -aAvh --progress root@${SOURCE_HOST}:/data/ /data --delete @@ -47,9 +46,6 @@ rsync -aAvh --progress root@${SOURCE_HOST}:/opt/factorio/ /opt/factorio --delete mkdir -p /var/lib/stb rsync -aAvh --progress root@${SOURCE_HOST}:/var/lib/stb/ /var/lib/stb --delete rsync -aAvh --progress root@${SOURCE_HOST}:{{docker_compose_files_folder_previous_server}}/stb/ {{docker_compose_files_folder}}/stb --delete -{% endif %} -{% if inventory_hostname in (groups['mail']) %} #Sync Mailu rsync -aAvh --progress root@${SOURCE_HOST}:/var/lib/mailu/ /var/lib/mailu --delete -{% endif %} diff --git a/roles/searx-docker/meta/main.yml b/roles/searx-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/searx-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/torrent-docker/meta/main.yml b/roles/torrent-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/torrent-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file diff --git a/roles/wiki-docker/meta/main.yml b/roles/wiki-docker/meta/main.yml deleted file mode 100644 index d29ba3a..0000000 --- a/roles/wiki-docker/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - traefik-proxy-docker \ No newline at end of file