diff --git a/main.yml b/main.yml index 07e3c4d..a003d7e 100644 --- a/main.yml +++ b/main.yml @@ -1,5 +1,5 @@ --- -- ansible.builtin.import_playbook: "playbooks/system/main.yml" -- ansible.builtin.import_playbook: "playbooks/vpn/main.yml" -- ansible.builtin.import_playbook: "playbooks/backups/main.yml" -- ansible.builtin.import_playbook: "playbooks/services/main.yml" +- ansible.builtin.import_playbook: "playbooks/system.yml" +- ansible.builtin.import_playbook: "playbooks/vpn.yml" +- ansible.builtin.import_playbook: "playbooks/backups.yml" +- ansible.builtin.import_playbook: "playbooks/services.yml" diff --git a/playbooks/backups/main.yml b/playbooks/backups.yml similarity index 78% rename from playbooks/backups/main.yml rename to playbooks/backups.yml index 873de50..5280538 100644 --- a/playbooks/backups/main.yml +++ b/playbooks/backups.yml @@ -2,9 +2,9 @@ - name: "backups : yggdrasil" hosts: "yggdrasil" roles: - - role: "snapshots" + - role: "backups/snapshots" when: the_nine_worlds_production | bool tags: "backups:snapshots" - - role: "restic" + - role: "backups/restic" when: the_nine_worlds_production | bool tags: "backups:restic" diff --git a/playbooks/services/files/setup_system/nameserver/.gitignore b/playbooks/files/services/setup_system/nameserver/.gitignore similarity index 100% rename from playbooks/services/files/setup_system/nameserver/.gitignore rename to playbooks/files/services/setup_system/nameserver/.gitignore diff --git a/playbooks/system/files/base/motd/heimdall b/playbooks/files/system/base/motd/heimdall similarity index 100% rename from playbooks/system/files/base/motd/heimdall rename to playbooks/files/system/base/motd/heimdall diff --git a/playbooks/system/files/base/motd/valkyrie b/playbooks/files/system/base/motd/valkyrie similarity index 100% rename from playbooks/system/files/base/motd/valkyrie rename to playbooks/files/system/base/motd/valkyrie diff --git a/playbooks/system/files/base/motd/yggdrasil b/playbooks/files/system/base/motd/yggdrasil similarity index 100% rename from playbooks/system/files/base/motd/yggdrasil rename to playbooks/files/system/base/motd/yggdrasil diff --git a/playbooks/system/files/smart/smartd.conf b/playbooks/files/system/smart/smartd.conf similarity index 100% rename from playbooks/system/files/smart/smartd.conf rename to playbooks/files/system/smart/smartd.conf diff --git a/playbooks/backups/roles/restic/files/restic-batch b/playbooks/roles/backups/restic/files/restic-batch similarity index 100% rename from playbooks/backups/roles/restic/files/restic-batch rename to playbooks/roles/backups/restic/files/restic-batch diff --git a/playbooks/backups/roles/restic/files/restic-batch.service b/playbooks/roles/backups/restic/files/restic-batch.service similarity index 100% rename from playbooks/backups/roles/restic/files/restic-batch.service rename to playbooks/roles/backups/restic/files/restic-batch.service diff --git a/playbooks/backups/roles/restic/files/restic-batch.timer b/playbooks/roles/backups/restic/files/restic-batch.timer similarity index 100% rename from playbooks/backups/roles/restic/files/restic-batch.timer rename to playbooks/roles/backups/restic/files/restic-batch.timer diff --git a/playbooks/backups/roles/restic/tasks/main.yml b/playbooks/roles/backups/restic/tasks/main.yml similarity index 100% rename from playbooks/backups/roles/restic/tasks/main.yml rename to playbooks/roles/backups/restic/tasks/main.yml diff --git a/playbooks/backups/roles/snapshots/files/sanoid-templates.conf b/playbooks/roles/backups/snapshots/files/sanoid-templates.conf similarity index 100% rename from playbooks/backups/roles/snapshots/files/sanoid-templates.conf rename to playbooks/roles/backups/snapshots/files/sanoid-templates.conf diff --git a/playbooks/backups/roles/snapshots/files/syncoid-batch b/playbooks/roles/backups/snapshots/files/syncoid-batch similarity index 100% rename from playbooks/backups/roles/snapshots/files/syncoid-batch rename to playbooks/roles/backups/snapshots/files/syncoid-batch diff --git a/playbooks/backups/roles/snapshots/files/syncoid-batch.service b/playbooks/roles/backups/snapshots/files/syncoid-batch.service similarity index 100% rename from playbooks/backups/roles/snapshots/files/syncoid-batch.service rename to playbooks/roles/backups/snapshots/files/syncoid-batch.service diff --git a/playbooks/backups/roles/snapshots/meta/argument_specs.yml b/playbooks/roles/backups/snapshots/meta/argument_specs.yml similarity index 100% rename from playbooks/backups/roles/snapshots/meta/argument_specs.yml rename to playbooks/roles/backups/snapshots/meta/argument_specs.yml diff --git a/playbooks/backups/roles/snapshots/tasks/main.yml b/playbooks/roles/backups/snapshots/tasks/main.yml similarity index 100% rename from playbooks/backups/roles/snapshots/tasks/main.yml rename to playbooks/roles/backups/snapshots/tasks/main.yml diff --git a/playbooks/services/roles/backups/meta/argument_specs.yml b/playbooks/roles/services/backups/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/backups/meta/argument_specs.yml rename to playbooks/roles/services/backups/meta/argument_specs.yml diff --git a/playbooks/services/roles/backups/tasks/include/restic.yml b/playbooks/roles/services/backups/tasks/include/restic.yml similarity index 100% rename from playbooks/services/roles/backups/tasks/include/restic.yml rename to playbooks/roles/services/backups/tasks/include/restic.yml diff --git a/playbooks/services/roles/backups/tasks/include/snapshots.yml b/playbooks/roles/services/backups/tasks/include/snapshots.yml similarity index 100% rename from playbooks/services/roles/backups/tasks/include/snapshots.yml rename to playbooks/roles/services/backups/tasks/include/snapshots.yml diff --git a/playbooks/services/roles/backups/tasks/main.yml b/playbooks/roles/services/backups/tasks/main.yml similarity index 97% rename from playbooks/services/roles/backups/tasks/main.yml rename to playbooks/roles/services/backups/tasks/main.yml index 7f45469..36ec364 100644 --- a/playbooks/services/roles/backups/tasks/main.yml +++ b/playbooks/roles/services/backups/tasks/main.yml @@ -1,6 +1,6 @@ - name: "play:services : role:backups:{{ services_service_name }} : tasks:vars" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" tags: - "services:backups:snapshots" diff --git a/playbooks/services/roles/backups/templates/restic/restic-aws-keys.yml.j2 b/playbooks/roles/services/backups/templates/restic/restic-aws-keys.yml.j2 similarity index 100% rename from playbooks/services/roles/backups/templates/restic/restic-aws-keys.yml.j2 rename to playbooks/roles/services/backups/templates/restic/restic-aws-keys.yml.j2 diff --git a/playbooks/services/roles/backups/templates/restic/restic-volumes-service.yml.j2 b/playbooks/roles/services/backups/templates/restic/restic-volumes-service.yml.j2 similarity index 100% rename from playbooks/services/roles/backups/templates/restic/restic-volumes-service.yml.j2 rename to playbooks/roles/services/backups/templates/restic/restic-volumes-service.yml.j2 diff --git a/playbooks/services/roles/backups/templates/restic/restic.password.j2 b/playbooks/roles/services/backups/templates/restic/restic.password.j2 similarity index 100% rename from playbooks/services/roles/backups/templates/restic/restic.password.j2 rename to playbooks/roles/services/backups/templates/restic/restic.password.j2 diff --git a/playbooks/services/roles/backups/templates/snapshots/syncoid-volumes-service.yml.j2 b/playbooks/roles/services/backups/templates/snapshots/syncoid-volumes-service.yml.j2 similarity index 100% rename from playbooks/services/roles/backups/templates/snapshots/syncoid-volumes-service.yml.j2 rename to playbooks/roles/services/backups/templates/snapshots/syncoid-volumes-service.yml.j2 diff --git a/playbooks/services/roles/backups/vars/main.yml b/playbooks/roles/services/backups/vars/main.yml similarity index 100% rename from playbooks/services/roles/backups/vars/main.yml rename to playbooks/roles/services/backups/vars/main.yml diff --git a/playbooks/services/roles/datasets/backups/system/meta/argument_specs.yml b/playbooks/roles/services/datasets/backups/system/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/datasets/backups/system/meta/argument_specs.yml rename to playbooks/roles/services/datasets/backups/system/meta/argument_specs.yml diff --git a/playbooks/services/roles/datasets/backups/system/tasks/main.yml b/playbooks/roles/services/datasets/backups/system/tasks/main.yml similarity index 100% rename from playbooks/services/roles/datasets/backups/system/tasks/main.yml rename to playbooks/roles/services/datasets/backups/system/tasks/main.yml diff --git a/playbooks/services/roles/datasets/backups/user/meta/argument_specs.yml b/playbooks/roles/services/datasets/backups/user/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/datasets/backups/user/meta/argument_specs.yml rename to playbooks/roles/services/datasets/backups/user/meta/argument_specs.yml diff --git a/playbooks/services/roles/datasets/backups/user/tasks/main.yml b/playbooks/roles/services/datasets/backups/user/tasks/main.yml similarity index 92% rename from playbooks/services/roles/datasets/backups/user/tasks/main.yml rename to playbooks/roles/services/datasets/backups/user/tasks/main.yml index 3cf5edf..9aa9535 100644 --- a/playbooks/services/roles/datasets/backups/user/tasks/main.yml +++ b/playbooks/roles/services/datasets/backups/user/tasks/main.yml @@ -1,6 +1,6 @@ - name: "{{ services_service_name }} : set variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "{{ services_service_name }} : create service backup data dataset" diff --git a/playbooks/services/roles/datasets/system/meta/argument_specs.yml b/playbooks/roles/services/datasets/system/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/datasets/system/meta/argument_specs.yml rename to playbooks/roles/services/datasets/system/meta/argument_specs.yml diff --git a/playbooks/services/roles/datasets/system/tasks/main.yml b/playbooks/roles/services/datasets/system/tasks/main.yml similarity index 100% rename from playbooks/services/roles/datasets/system/tasks/main.yml rename to playbooks/roles/services/datasets/system/tasks/main.yml diff --git a/playbooks/services/roles/datasets/user/meta/argument_specs.yml b/playbooks/roles/services/datasets/user/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/datasets/user/meta/argument_specs.yml rename to playbooks/roles/services/datasets/user/meta/argument_specs.yml diff --git a/playbooks/services/roles/datasets/user/tasks/main.yml b/playbooks/roles/services/datasets/user/tasks/main.yml similarity index 95% rename from playbooks/services/roles/datasets/user/tasks/main.yml rename to playbooks/roles/services/datasets/user/tasks/main.yml index 74be8aa..de3ba72 100644 --- a/playbooks/services/roles/datasets/user/tasks/main.yml +++ b/playbooks/roles/services/datasets/user/tasks/main.yml @@ -1,6 +1,6 @@ - name: "{{ services_service_name }} : set variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "{{ services_service_name }} : create home dataset" @@ -26,7 +26,7 @@ - name: "{{ services_service_name }} : include volume list" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "volumes" - name: "{{ services_service_name }} : create volume datasets" diff --git a/playbooks/services/roles/deploy/cloud/files/config/nginx.conf b/playbooks/roles/services/deploy/cloud/files/config/nginx.conf similarity index 100% rename from playbooks/services/roles/deploy/cloud/files/config/nginx.conf rename to playbooks/roles/services/deploy/cloud/files/config/nginx.conf diff --git a/playbooks/services/roles/deploy/cloud/meta/argument_specs.yml b/playbooks/roles/services/deploy/cloud/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/cloud/meta/argument_specs.yml rename to playbooks/roles/services/deploy/cloud/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/cloud/tasks/main.yml b/playbooks/roles/services/deploy/cloud/tasks/main.yml similarity index 97% rename from playbooks/services/roles/deploy/cloud/tasks/main.yml rename to playbooks/roles/services/deploy/cloud/tasks/main.yml index 2ceac8f..20743b4 100644 --- a/playbooks/services/roles/deploy/cloud/tasks/main.yml +++ b/playbooks/roles/services/deploy/cloud/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - block: diff --git a/playbooks/services/roles/deploy/cloud/templates/nextcloud/admin.password.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/nextcloud/admin.password.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/nextcloud/admin.user.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/nextcloud/admin.user.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/nextcloud/database.name.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/nextcloud/database.name.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/nextcloud/database.password.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/nextcloud/database.password.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/nextcloud/database.user.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/nextcloud/database.user.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 diff --git a/playbooks/services/roles/deploy/cloud/templates/systemd/pod-cloud.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/cloud/templates/systemd/pod-cloud.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service.j2 diff --git a/playbooks/services/roles/deploy/database/meta/argument_specs.yml b/playbooks/roles/services/deploy/database/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/database/meta/argument_specs.yml rename to playbooks/roles/services/deploy/database/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/database/tasks/main.yml b/playbooks/roles/services/deploy/database/tasks/main.yml similarity index 96% rename from playbooks/services/roles/deploy/database/tasks/main.yml rename to playbooks/roles/services/deploy/database/tasks/main.yml index 07e0b63..286e88c 100644 --- a/playbooks/services/roles/deploy/database/tasks/main.yml +++ b/playbooks/roles/services/deploy/database/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - block: diff --git a/playbooks/services/roles/deploy/database/templates/postgres/database.password.j2 b/playbooks/roles/services/deploy/database/templates/postgres/database.password.j2 similarity index 100% rename from playbooks/services/roles/deploy/database/templates/postgres/database.password.j2 rename to playbooks/roles/services/deploy/database/templates/postgres/database.password.j2 diff --git a/playbooks/services/roles/deploy/database/templates/systemd/container-database-postgres.service.j2 b/playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/database/templates/systemd/container-database-postgres.service.j2 rename to playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service.j2 diff --git a/playbooks/services/roles/deploy/database/templates/systemd/pod-database.service.j2 b/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/database/templates/systemd/pod-database.service.j2 rename to playbooks/roles/services/deploy/database/templates/systemd/pod-database.service.j2 diff --git a/playbooks/services/roles/deploy/git/meta/argument_specs.yml b/playbooks/roles/services/deploy/git/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/git/meta/argument_specs.yml rename to playbooks/roles/services/deploy/git/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/git/tasks/main.yml b/playbooks/roles/services/deploy/git/tasks/main.yml similarity index 95% rename from playbooks/services/roles/deploy/git/tasks/main.yml rename to playbooks/roles/services/deploy/git/tasks/main.yml index 7c14a12..d080626 100644 --- a/playbooks/services/roles/deploy/git/tasks/main.yml +++ b/playbooks/roles/services/deploy/git/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - block: diff --git a/playbooks/services/roles/deploy/git/templates/systemd/container-git-gitea.service.j2 b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/git/templates/systemd/container-git-gitea.service.j2 rename to playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service.j2 diff --git a/playbooks/services/roles/deploy/git/templates/systemd/pod-git.service.j2 b/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/git/templates/systemd/pod-git.service.j2 rename to playbooks/roles/services/deploy/git/templates/systemd/pod-git.service.j2 diff --git a/playbooks/services/roles/deploy/include/vars/versions.yml b/playbooks/roles/services/deploy/include/vars/versions.yml similarity index 100% rename from playbooks/services/roles/deploy/include/vars/versions.yml rename to playbooks/roles/services/deploy/include/vars/versions.yml diff --git a/playbooks/services/roles/deploy/lrproxy/files/config b/playbooks/roles/services/deploy/lrproxy/files/config similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/files/config rename to playbooks/roles/services/deploy/lrproxy/files/config diff --git a/playbooks/services/roles/deploy/lrproxy/meta/argument_specs.yml b/playbooks/roles/services/deploy/lrproxy/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/meta/argument_specs.yml rename to playbooks/roles/services/deploy/lrproxy/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/lrproxy/tasks/main.yml b/playbooks/roles/services/deploy/lrproxy/tasks/main.yml similarity index 98% rename from playbooks/services/roles/deploy/lrproxy/tasks/main.yml rename to playbooks/roles/services/deploy/lrproxy/tasks/main.yml index d0ccd03..f96955f 100644 --- a/playbooks/services/roles/deploy/lrproxy/tasks/main.yml +++ b/playbooks/roles/services/deploy/lrproxy/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - name: "set the rproxy variables" diff --git a/playbooks/services/roles/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 diff --git a/playbooks/services/roles/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 diff --git a/playbooks/services/roles/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 diff --git a/playbooks/services/roles/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 diff --git a/playbooks/services/roles/deploy/lrproxy/vars/nginx.yml b/playbooks/roles/services/deploy/lrproxy/vars/nginx.yml similarity index 100% rename from playbooks/services/roles/deploy/lrproxy/vars/nginx.yml rename to playbooks/roles/services/deploy/lrproxy/vars/nginx.yml diff --git a/playbooks/services/roles/deploy/notes/meta/argument_specs.yml b/playbooks/roles/services/deploy/notes/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/notes/meta/argument_specs.yml rename to playbooks/roles/services/deploy/notes/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/notes/tasks/main.yml b/playbooks/roles/services/deploy/notes/tasks/main.yml similarity index 95% rename from playbooks/services/roles/deploy/notes/tasks/main.yml rename to playbooks/roles/services/deploy/notes/tasks/main.yml index 829b1b6..f4c52ab 100644 --- a/playbooks/services/roles/deploy/notes/tasks/main.yml +++ b/playbooks/roles/services/deploy/notes/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - block: diff --git a/playbooks/services/roles/deploy/notes/templates/systemd/container-notes-chown.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/notes/templates/systemd/container-notes-chown.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service.j2 diff --git a/playbooks/services/roles/deploy/notes/templates/systemd/container-notes-joplin.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/notes/templates/systemd/container-notes-joplin.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service.j2 diff --git a/playbooks/services/roles/deploy/notes/templates/systemd/pod-notes.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/notes/templates/systemd/pod-notes.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service.j2 diff --git a/playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/cloud.wojciechkozlowski.eu.conf b/playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/cloud.wojciechkozlowski.eu.conf similarity index 100% rename from playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/cloud.wojciechkozlowski.eu.conf rename to playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/cloud.wojciechkozlowski.eu.conf diff --git a/playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/git.wojciechkozlowski.eu.conf b/playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/git.wojciechkozlowski.eu.conf similarity index 100% rename from playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/git.wojciechkozlowski.eu.conf rename to playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/git.wojciechkozlowski.eu.conf diff --git a/playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/notes.wojciechkozlowski.eu.conf b/playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/notes.wojciechkozlowski.eu.conf similarity index 100% rename from playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/notes.wojciechkozlowski.eu.conf rename to playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/notes.wojciechkozlowski.eu.conf diff --git a/playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/wojciechkozlowski.eu.conf b/playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/wojciechkozlowski.eu.conf similarity index 100% rename from playbooks/services/roles/deploy/rproxy/files/config/nginx-conf.d/wojciechkozlowski.eu.conf rename to playbooks/roles/services/deploy/rproxy/files/config/nginx-conf.d/wojciechkozlowski.eu.conf diff --git a/playbooks/services/roles/deploy/rproxy/files/config/nginx.conf b/playbooks/roles/services/deploy/rproxy/files/config/nginx.conf similarity index 100% rename from playbooks/services/roles/deploy/rproxy/files/config/nginx.conf rename to playbooks/roles/services/deploy/rproxy/files/config/nginx.conf diff --git a/playbooks/services/roles/deploy/rproxy/meta/argument_specs.yml b/playbooks/roles/services/deploy/rproxy/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/rproxy/meta/argument_specs.yml rename to playbooks/roles/services/deploy/rproxy/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/rproxy/tasks/main.yml b/playbooks/roles/services/deploy/rproxy/tasks/main.yml similarity index 97% rename from playbooks/services/roles/deploy/rproxy/tasks/main.yml rename to playbooks/roles/services/deploy/rproxy/tasks/main.yml index 23bafe8..2db63d4 100644 --- a/playbooks/services/roles/deploy/rproxy/tasks/main.yml +++ b/playbooks/roles/services/deploy/rproxy/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - name: "set the rproxy variables" diff --git a/playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 diff --git a/playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 similarity index 100% rename from playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 diff --git a/playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 diff --git a/playbooks/services/roles/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 diff --git a/playbooks/services/roles/deploy/rproxy/vars/nginx.yml b/playbooks/roles/services/deploy/rproxy/vars/nginx.yml similarity index 100% rename from playbooks/services/roles/deploy/rproxy/vars/nginx.yml rename to playbooks/roles/services/deploy/rproxy/vars/nginx.yml diff --git a/playbooks/services/roles/deploy/www/meta/argument_specs.yml b/playbooks/roles/services/deploy/www/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/deploy/www/meta/argument_specs.yml rename to playbooks/roles/services/deploy/www/meta/argument_specs.yml diff --git a/playbooks/services/roles/deploy/www/tasks/main.yml b/playbooks/roles/services/deploy/www/tasks/main.yml similarity index 97% rename from playbooks/services/roles/deploy/www/tasks/main.yml rename to playbooks/roles/services/deploy/www/tasks/main.yml index ad28ca1..f8feb84 100644 --- a/playbooks/services/roles/deploy/www/tasks/main.yml +++ b/playbooks/roles/services/deploy/www/tasks/main.yml @@ -1,11 +1,11 @@ - name: "set the user variables" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" - name: "set the version variables" ansible.builtin.import_role: - name: "deploy/include" + name: "services/deploy/include" vars_from: "versions" - name: "check if hugo is installed" diff --git a/playbooks/services/roles/deploy/www/templates/hugo/apt.j2 b/playbooks/roles/services/deploy/www/templates/hugo/apt.j2 similarity index 100% rename from playbooks/services/roles/deploy/www/templates/hugo/apt.j2 rename to playbooks/roles/services/deploy/www/templates/hugo/apt.j2 diff --git a/playbooks/services/roles/deploy/www/templates/systemd/container-www-nginx.service.j2 b/playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/www/templates/systemd/container-www-nginx.service.j2 rename to playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service.j2 diff --git a/playbooks/services/roles/deploy/www/templates/systemd/pod-www.service.j2 b/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service.j2 similarity index 100% rename from playbooks/services/roles/deploy/www/templates/systemd/pod-www.service.j2 rename to playbooks/roles/services/deploy/www/templates/systemd/pod-www.service.j2 diff --git a/playbooks/services/roles/include/meta/argument_specs.yml b/playbooks/roles/services/include/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/include/meta/argument_specs.yml rename to playbooks/roles/services/include/meta/argument_specs.yml diff --git a/playbooks/services/roles/include/tasks/daemon_reload.yml b/playbooks/roles/services/include/tasks/daemon_reload.yml similarity index 100% rename from playbooks/services/roles/include/tasks/daemon_reload.yml rename to playbooks/roles/services/include/tasks/daemon_reload.yml diff --git a/playbooks/services/roles/include/tasks/daemon_reload/main.yml b/playbooks/roles/services/include/tasks/daemon_reload/main.yml similarity index 100% rename from playbooks/services/roles/include/tasks/daemon_reload/main.yml rename to playbooks/roles/services/include/tasks/daemon_reload/main.yml diff --git a/playbooks/services/roles/include/vars/user.yml b/playbooks/roles/services/include/vars/user.yml similarity index 100% rename from playbooks/services/roles/include/vars/user.yml rename to playbooks/roles/services/include/vars/user.yml diff --git a/playbooks/services/roles/include/vars/volumes.yml b/playbooks/roles/services/include/vars/volumes.yml similarity index 100% rename from playbooks/services/roles/include/vars/volumes.yml rename to playbooks/roles/services/include/vars/volumes.yml diff --git a/playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update b/playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update similarity index 100% rename from playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update rename to playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update diff --git a/playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update.service b/playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update.service similarity index 100% rename from playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update.service rename to playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update.service diff --git a/playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update.timer b/playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update.timer similarity index 100% rename from playbooks/services/roles/setup/system/files/auto_update/pod-service-auto-update.timer rename to playbooks/roles/services/setup/system/files/auto_update/pod-service-auto-update.timer diff --git a/playbooks/services/roles/setup/system/files/auto_update/podman-image-prune.service b/playbooks/roles/services/setup/system/files/auto_update/podman-image-prune.service similarity index 100% rename from playbooks/services/roles/setup/system/files/auto_update/podman-image-prune.service rename to playbooks/roles/services/setup/system/files/auto_update/podman-image-prune.service diff --git a/playbooks/services/roles/setup/system/files/veth/connect-pod-service@.service b/playbooks/roles/services/setup/system/files/veth/connect-pod-service@.service similarity index 100% rename from playbooks/services/roles/setup/system/files/veth/connect-pod-service@.service rename to playbooks/roles/services/setup/system/files/veth/connect-pod-service@.service diff --git a/playbooks/services/roles/setup/system/meta/argument_specs.yml b/playbooks/roles/services/setup/system/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/setup/system/meta/argument_specs.yml rename to playbooks/roles/services/setup/system/meta/argument_specs.yml diff --git a/playbooks/services/roles/setup/system/tasks/include/auto_update.yml b/playbooks/roles/services/setup/system/tasks/include/auto_update.yml similarity index 98% rename from playbooks/services/roles/setup/system/tasks/include/auto_update.yml rename to playbooks/roles/services/setup/system/tasks/include/auto_update.yml index 05102e5..d874aae 100644 --- a/playbooks/services/roles/setup/system/tasks/include/auto_update.yml +++ b/playbooks/roles/services/setup/system/tasks/include/auto_update.yml @@ -29,7 +29,7 @@ # the above tasks haven't executed. - name: "auto_update : systemd daemon reload for each service" ansible.builtin.include_role: - name: "include" + name: "services/include" tasks_from: "daemon_reload" when: services_setup_system_pod_service_auto_update_service_file.changed or diff --git a/playbooks/services/roles/setup/system/tasks/include/directories.yml b/playbooks/roles/services/setup/system/tasks/include/directories.yml similarity index 100% rename from playbooks/services/roles/setup/system/tasks/include/directories.yml rename to playbooks/roles/services/setup/system/tasks/include/directories.yml diff --git a/playbooks/services/roles/setup/system/tasks/include/nameserver.yml b/playbooks/roles/services/setup/system/tasks/include/nameserver.yml similarity index 75% rename from playbooks/services/roles/setup/system/tasks/include/nameserver.yml rename to playbooks/roles/services/setup/system/tasks/include/nameserver.yml index 1d2e63e..b5c051b 100644 --- a/playbooks/services/roles/setup/system/tasks/include/nameserver.yml +++ b/playbooks/roles/services/setup/system/tasks/include/nameserver.yml @@ -1,14 +1,14 @@ - name: "nameserver : fetch valkyrie's resolv.conf" ansible.builtin.fetch: src: "/etc/resolv.conf" - dest: "./files/setup_system/nameserver/" + dest: "./files/services/setup_system/nameserver/" flat: true when: ansible_hostname == "valkyrie" - name: "nameserver : copy valkyrie's resolv.conf to other hosts" ansible.builtin.copy: - src: "../../../files/setup_system/nameserver/resolv.conf" + src: "files/services/setup_system/nameserver/resolv.conf" dest: "{{ services_root_directory }}/valkyrie-resolv.conf" when: ansible_hostname != "valkyrie" diff --git a/playbooks/services/roles/setup/system/tasks/include/podman.yml b/playbooks/roles/services/setup/system/tasks/include/podman.yml similarity index 100% rename from playbooks/services/roles/setup/system/tasks/include/podman.yml rename to playbooks/roles/services/setup/system/tasks/include/podman.yml diff --git a/playbooks/services/roles/setup/system/tasks/include/veth.yml b/playbooks/roles/services/setup/system/tasks/include/veth.yml similarity index 100% rename from playbooks/services/roles/setup/system/tasks/include/veth.yml rename to playbooks/roles/services/setup/system/tasks/include/veth.yml diff --git a/playbooks/services/roles/setup/system/tasks/main.yml b/playbooks/roles/services/setup/system/tasks/main.yml similarity index 100% rename from playbooks/services/roles/setup/system/tasks/main.yml rename to playbooks/roles/services/setup/system/tasks/main.yml diff --git a/playbooks/services/roles/setup/system/templates/veth/connect-pod-service@.path.j2 b/playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path.j2 similarity index 100% rename from playbooks/services/roles/setup/system/templates/veth/connect-pod-service@.path.j2 rename to playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path.j2 diff --git a/playbooks/services/roles/setup/user/meta/argument_specs.yml b/playbooks/roles/services/setup/user/meta/argument_specs.yml similarity index 100% rename from playbooks/services/roles/setup/user/meta/argument_specs.yml rename to playbooks/roles/services/setup/user/meta/argument_specs.yml diff --git a/playbooks/services/roles/setup/user/tasks/include/auto_update.yml b/playbooks/roles/services/setup/user/tasks/include/auto_update.yml similarity index 100% rename from playbooks/services/roles/setup/user/tasks/include/auto_update.yml rename to playbooks/roles/services/setup/user/tasks/include/auto_update.yml diff --git a/playbooks/services/roles/setup/user/tasks/include/directories.yml b/playbooks/roles/services/setup/user/tasks/include/directories.yml similarity index 98% rename from playbooks/services/roles/setup/user/tasks/include/directories.yml rename to playbooks/roles/services/setup/user/tasks/include/directories.yml index d7d6ab2..bd36ca8 100644 --- a/playbooks/services/roles/setup/user/tasks/include/directories.yml +++ b/playbooks/roles/services/setup/user/tasks/include/directories.yml @@ -16,7 +16,7 @@ - name: "{{ services_service_name }} : directories : include volume list" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "volumes" - name: "{{ services_service_name }} : directories : create volume directories" diff --git a/playbooks/services/roles/setup/user/tasks/include/directories/volumes.yml b/playbooks/roles/services/setup/user/tasks/include/directories/volumes.yml similarity index 100% rename from playbooks/services/roles/setup/user/tasks/include/directories/volumes.yml rename to playbooks/roles/services/setup/user/tasks/include/directories/volumes.yml diff --git a/playbooks/services/roles/setup/user/tasks/include/podman.yml b/playbooks/roles/services/setup/user/tasks/include/podman.yml similarity index 100% rename from playbooks/services/roles/setup/user/tasks/include/podman.yml rename to playbooks/roles/services/setup/user/tasks/include/podman.yml diff --git a/playbooks/services/roles/setup/user/tasks/include/user.yml b/playbooks/roles/services/setup/user/tasks/include/user.yml similarity index 100% rename from playbooks/services/roles/setup/user/tasks/include/user.yml rename to playbooks/roles/services/setup/user/tasks/include/user.yml diff --git a/playbooks/services/roles/setup/user/tasks/include/veth.yml b/playbooks/roles/services/setup/user/tasks/include/veth.yml similarity index 100% rename from playbooks/services/roles/setup/user/tasks/include/veth.yml rename to playbooks/roles/services/setup/user/tasks/include/veth.yml diff --git a/playbooks/services/roles/setup/user/tasks/main.yml b/playbooks/roles/services/setup/user/tasks/main.yml similarity index 98% rename from playbooks/services/roles/setup/user/tasks/main.yml rename to playbooks/roles/services/setup/user/tasks/main.yml index b6f88a2..928d93c 100644 --- a/playbooks/services/roles/setup/user/tasks/main.yml +++ b/playbooks/roles/services/setup/user/tasks/main.yml @@ -1,6 +1,6 @@ - name: "play:services : role:setup_user:{{ services_service_name }} : tasks:vars" ansible.builtin.import_role: - name: "include" + name: "services/include" vars_from: "user" tags: - "services:setup_user:user" diff --git a/playbooks/services/roles/setup/user/templates/podman/storage.conf.j2 b/playbooks/roles/services/setup/user/templates/podman/storage.conf.j2 similarity index 100% rename from playbooks/services/roles/setup/user/templates/podman/storage.conf.j2 rename to playbooks/roles/services/setup/user/templates/podman/storage.conf.j2 diff --git a/playbooks/services/roles/setup/user/templates/veth/interface.j2 b/playbooks/roles/services/setup/user/templates/veth/interface.j2 similarity index 100% rename from playbooks/services/roles/setup/user/templates/veth/interface.j2 rename to playbooks/roles/services/setup/user/templates/veth/interface.j2 diff --git a/playbooks/services/roles/setup/user/vars/main.yml b/playbooks/roles/services/setup/user/vars/main.yml similarity index 100% rename from playbooks/services/roles/setup/user/vars/main.yml rename to playbooks/roles/services/setup/user/vars/main.yml diff --git a/playbooks/system/roles/base/defaults/main.yml b/playbooks/roles/system/base/defaults/main.yml similarity index 100% rename from playbooks/system/roles/base/defaults/main.yml rename to playbooks/roles/system/base/defaults/main.yml diff --git a/playbooks/system/roles/base/files/logcheck/ignore b/playbooks/roles/system/base/files/logcheck/ignore similarity index 100% rename from playbooks/system/roles/base/files/logcheck/ignore rename to playbooks/roles/system/base/files/logcheck/ignore diff --git a/playbooks/system/roles/base/files/logcheck/logcheck.conf b/playbooks/roles/system/base/files/logcheck/logcheck.conf similarity index 100% rename from playbooks/system/roles/base/files/logcheck/logcheck.conf rename to playbooks/roles/system/base/files/logcheck/logcheck.conf diff --git a/playbooks/system/roles/base/files/root/su b/playbooks/roles/system/base/files/root/su similarity index 100% rename from playbooks/system/roles/base/files/root/su rename to playbooks/roles/system/base/files/root/su diff --git a/playbooks/system/roles/base/files/systemd_mail/system/status-mail@.service b/playbooks/roles/system/base/files/systemd_mail/system/status-mail@.service similarity index 100% rename from playbooks/system/roles/base/files/systemd_mail/system/status-mail@.service rename to playbooks/roles/system/base/files/systemd_mail/system/status-mail@.service diff --git a/playbooks/system/roles/base/files/systemd_mail/user/status-mail@.service b/playbooks/roles/system/base/files/systemd_mail/user/status-mail@.service similarity index 100% rename from playbooks/system/roles/base/files/systemd_mail/user/status-mail@.service rename to playbooks/roles/system/base/files/systemd_mail/user/status-mail@.service diff --git a/playbooks/system/roles/base/files/unattended_upgrades/20auto-upgrades b/playbooks/roles/system/base/files/unattended_upgrades/20auto-upgrades similarity index 100% rename from playbooks/system/roles/base/files/unattended_upgrades/20auto-upgrades rename to playbooks/roles/system/base/files/unattended_upgrades/20auto-upgrades diff --git a/playbooks/system/roles/base/files/unattended_upgrades/50unattended-upgrades b/playbooks/roles/system/base/files/unattended_upgrades/50unattended-upgrades similarity index 100% rename from playbooks/system/roles/base/files/unattended_upgrades/50unattended-upgrades rename to playbooks/roles/system/base/files/unattended_upgrades/50unattended-upgrades diff --git a/playbooks/system/roles/base/files/user/bashrc b/playbooks/roles/system/base/files/user/bashrc similarity index 100% rename from playbooks/system/roles/base/files/user/bashrc rename to playbooks/roles/system/base/files/user/bashrc diff --git a/playbooks/system/roles/base/files/user/tmux.conf b/playbooks/roles/system/base/files/user/tmux.conf similarity index 100% rename from playbooks/system/roles/base/files/user/tmux.conf rename to playbooks/roles/system/base/files/user/tmux.conf diff --git a/playbooks/system/roles/base/meta/argument_specs.yml b/playbooks/roles/system/base/meta/argument_specs.yml similarity index 100% rename from playbooks/system/roles/base/meta/argument_specs.yml rename to playbooks/roles/system/base/meta/argument_specs.yml diff --git a/playbooks/system/roles/base/tasks/include/fail2ban.yml b/playbooks/roles/system/base/tasks/include/fail2ban.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/fail2ban.yml rename to playbooks/roles/system/base/tasks/include/fail2ban.yml diff --git a/playbooks/system/roles/base/tasks/include/fstrim.yml b/playbooks/roles/system/base/tasks/include/fstrim.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/fstrim.yml rename to playbooks/roles/system/base/tasks/include/fstrim.yml diff --git a/playbooks/system/roles/base/tasks/include/logs.yml b/playbooks/roles/system/base/tasks/include/logs.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/logs.yml rename to playbooks/roles/system/base/tasks/include/logs.yml diff --git a/playbooks/system/roles/base/tasks/include/motd.yml b/playbooks/roles/system/base/tasks/include/motd.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/motd.yml rename to playbooks/roles/system/base/tasks/include/motd.yml diff --git a/playbooks/system/roles/base/tasks/include/ntp.yml b/playbooks/roles/system/base/tasks/include/ntp.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/ntp.yml rename to playbooks/roles/system/base/tasks/include/ntp.yml diff --git a/playbooks/system/roles/base/tasks/include/root.yml b/playbooks/roles/system/base/tasks/include/root.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/root.yml rename to playbooks/roles/system/base/tasks/include/root.yml diff --git a/playbooks/system/roles/base/tasks/include/sshd.yml b/playbooks/roles/system/base/tasks/include/sshd.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/sshd.yml rename to playbooks/roles/system/base/tasks/include/sshd.yml diff --git a/playbooks/system/roles/base/tasks/include/systemd_mail.yml b/playbooks/roles/system/base/tasks/include/systemd_mail.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/systemd_mail.yml rename to playbooks/roles/system/base/tasks/include/systemd_mail.yml diff --git a/playbooks/system/roles/base/tasks/include/unattended_upgrades.yml b/playbooks/roles/system/base/tasks/include/unattended_upgrades.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/unattended_upgrades.yml rename to playbooks/roles/system/base/tasks/include/unattended_upgrades.yml diff --git a/playbooks/system/roles/base/tasks/include/user.yml b/playbooks/roles/system/base/tasks/include/user.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/user.yml rename to playbooks/roles/system/base/tasks/include/user.yml diff --git a/playbooks/system/roles/base/tasks/include/utils.yml b/playbooks/roles/system/base/tasks/include/utils.yml similarity index 100% rename from playbooks/system/roles/base/tasks/include/utils.yml rename to playbooks/roles/system/base/tasks/include/utils.yml diff --git a/playbooks/system/roles/base/tasks/main.yml b/playbooks/roles/system/base/tasks/main.yml similarity index 100% rename from playbooks/system/roles/base/tasks/main.yml rename to playbooks/roles/system/base/tasks/main.yml diff --git a/playbooks/system/roles/base/templates/fail2ban/jail.d/sshd.local.j2 b/playbooks/roles/system/base/templates/fail2ban/jail.d/sshd.local.j2 similarity index 100% rename from playbooks/system/roles/base/templates/fail2ban/jail.d/sshd.local.j2 rename to playbooks/roles/system/base/templates/fail2ban/jail.d/sshd.local.j2 diff --git a/playbooks/system/roles/base/templates/fail2ban/jail.local.j2 b/playbooks/roles/system/base/templates/fail2ban/jail.local.j2 similarity index 100% rename from playbooks/system/roles/base/templates/fail2ban/jail.local.j2 rename to playbooks/roles/system/base/templates/fail2ban/jail.local.j2 diff --git a/playbooks/system/roles/base/templates/sshd/99-local.conf.j2 b/playbooks/roles/system/base/templates/sshd/99-local.conf.j2 similarity index 100% rename from playbooks/system/roles/base/templates/sshd/99-local.conf.j2 rename to playbooks/roles/system/base/templates/sshd/99-local.conf.j2 diff --git a/playbooks/system/roles/base/templates/systemd_mail/system/systemd-mail-systemctl-status.j2 b/playbooks/roles/system/base/templates/systemd_mail/system/systemd-mail-systemctl-status.j2 similarity index 100% rename from playbooks/system/roles/base/templates/systemd_mail/system/systemd-mail-systemctl-status.j2 rename to playbooks/roles/system/base/templates/systemd_mail/system/systemd-mail-systemctl-status.j2 diff --git a/playbooks/system/roles/base/templates/systemd_mail/user/systemd-mail-systemctl-status.j2 b/playbooks/roles/system/base/templates/systemd_mail/user/systemd-mail-systemctl-status.j2 similarity index 100% rename from playbooks/system/roles/base/templates/systemd_mail/user/systemd-mail-systemctl-status.j2 rename to playbooks/roles/system/base/templates/systemd_mail/user/systemd-mail-systemctl-status.j2 diff --git a/playbooks/system/roles/mail/meta/argument_specs.yml b/playbooks/roles/system/mail/meta/argument_specs.yml similarity index 100% rename from playbooks/system/roles/mail/meta/argument_specs.yml rename to playbooks/roles/system/mail/meta/argument_specs.yml diff --git a/playbooks/system/roles/mail/tasks/main.yml b/playbooks/roles/system/mail/tasks/main.yml similarity index 100% rename from playbooks/system/roles/mail/tasks/main.yml rename to playbooks/roles/system/mail/tasks/main.yml diff --git a/playbooks/system/roles/mail/templates/aliases.j2 b/playbooks/roles/system/mail/templates/aliases.j2 similarity index 100% rename from playbooks/system/roles/mail/templates/aliases.j2 rename to playbooks/roles/system/mail/templates/aliases.j2 diff --git a/playbooks/system/roles/mail/templates/mailname.j2 b/playbooks/roles/system/mail/templates/mailname.j2 similarity index 100% rename from playbooks/system/roles/mail/templates/mailname.j2 rename to playbooks/roles/system/mail/templates/mailname.j2 diff --git a/playbooks/system/roles/mail/templates/mailutils.conf.j2 b/playbooks/roles/system/mail/templates/mailutils.conf.j2 similarity index 100% rename from playbooks/system/roles/mail/templates/mailutils.conf.j2 rename to playbooks/roles/system/mail/templates/mailutils.conf.j2 diff --git a/playbooks/system/roles/mail/templates/postfix/main.cf.j2 b/playbooks/roles/system/mail/templates/postfix/main.cf.j2 similarity index 100% rename from playbooks/system/roles/mail/templates/postfix/main.cf.j2 rename to playbooks/roles/system/mail/templates/postfix/main.cf.j2 diff --git a/playbooks/system/roles/mail/templates/postfix/sasl_passwd.j2 b/playbooks/roles/system/mail/templates/postfix/sasl_passwd.j2 similarity index 100% rename from playbooks/system/roles/mail/templates/postfix/sasl_passwd.j2 rename to playbooks/roles/system/mail/templates/postfix/sasl_passwd.j2 diff --git a/playbooks/system/roles/nftables/defaults/main.yml b/playbooks/roles/system/nftables/defaults/main.yml similarity index 100% rename from playbooks/system/roles/nftables/defaults/main.yml rename to playbooks/roles/system/nftables/defaults/main.yml diff --git a/playbooks/system/roles/nftables/meta/argument_specs.yml b/playbooks/roles/system/nftables/meta/argument_specs.yml similarity index 100% rename from playbooks/system/roles/nftables/meta/argument_specs.yml rename to playbooks/roles/system/nftables/meta/argument_specs.yml diff --git a/playbooks/system/roles/nftables/tasks/main.yml b/playbooks/roles/system/nftables/tasks/main.yml similarity index 100% rename from playbooks/system/roles/nftables/tasks/main.yml rename to playbooks/roles/system/nftables/tasks/main.yml diff --git a/playbooks/system/roles/nftables/templates/nftables.conf.j2 b/playbooks/roles/system/nftables/templates/nftables.conf.j2 similarity index 100% rename from playbooks/system/roles/nftables/templates/nftables.conf.j2 rename to playbooks/roles/system/nftables/templates/nftables.conf.j2 diff --git a/playbooks/system/roles/smart/meta/argument_specs.yml b/playbooks/roles/system/smart/meta/argument_specs.yml similarity index 100% rename from playbooks/system/roles/smart/meta/argument_specs.yml rename to playbooks/roles/system/smart/meta/argument_specs.yml diff --git a/playbooks/system/roles/smart/tasks/main.yml b/playbooks/roles/system/smart/tasks/main.yml similarity index 100% rename from playbooks/system/roles/smart/tasks/main.yml rename to playbooks/roles/system/smart/tasks/main.yml diff --git a/playbooks/system/roles/ups/files/apcupsd.conf b/playbooks/roles/system/ups/files/apcupsd.conf similarity index 100% rename from playbooks/system/roles/ups/files/apcupsd.conf rename to playbooks/roles/system/ups/files/apcupsd.conf diff --git a/playbooks/system/roles/ups/tasks/main.yml b/playbooks/roles/system/ups/tasks/main.yml similarity index 100% rename from playbooks/system/roles/ups/tasks/main.yml rename to playbooks/roles/system/ups/tasks/main.yml diff --git a/playbooks/system/roles/zfs/defaults/main.yml b/playbooks/roles/system/zfs/defaults/main.yml similarity index 100% rename from playbooks/system/roles/zfs/defaults/main.yml rename to playbooks/roles/system/zfs/defaults/main.yml diff --git a/playbooks/system/roles/zfs/files/conf/zfs.conf b/playbooks/roles/system/zfs/files/conf/zfs.conf similarity index 100% rename from playbooks/system/roles/zfs/files/conf/zfs.conf rename to playbooks/roles/system/zfs/files/conf/zfs.conf diff --git a/playbooks/system/roles/zfs/files/fstrim/fstrim.timer b/playbooks/roles/system/zfs/files/fstrim/fstrim.timer similarity index 100% rename from playbooks/system/roles/zfs/files/fstrim/fstrim.timer rename to playbooks/roles/system/zfs/files/fstrim/fstrim.timer diff --git a/playbooks/system/roles/zfs/files/load_key/zfs-load-key@.service b/playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service similarity index 100% rename from playbooks/system/roles/zfs/files/load_key/zfs-load-key@.service rename to playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service diff --git a/playbooks/system/roles/zfs/files/scrub/zfs-scrub-monthly@.timer b/playbooks/roles/system/zfs/files/scrub/zfs-scrub-monthly@.timer similarity index 100% rename from playbooks/system/roles/zfs/files/scrub/zfs-scrub-monthly@.timer rename to playbooks/roles/system/zfs/files/scrub/zfs-scrub-monthly@.timer diff --git a/playbooks/system/roles/zfs/files/scrub/zfs-scrub@.service b/playbooks/roles/system/zfs/files/scrub/zfs-scrub@.service similarity index 100% rename from playbooks/system/roles/zfs/files/scrub/zfs-scrub@.service rename to playbooks/roles/system/zfs/files/scrub/zfs-scrub@.service diff --git a/playbooks/system/roles/zfs/files/trim/zfs-trim-monthly@.timer b/playbooks/roles/system/zfs/files/trim/zfs-trim-monthly@.timer similarity index 100% rename from playbooks/system/roles/zfs/files/trim/zfs-trim-monthly@.timer rename to playbooks/roles/system/zfs/files/trim/zfs-trim-monthly@.timer diff --git a/playbooks/system/roles/zfs/files/trim/zfs-trim@.service b/playbooks/roles/system/zfs/files/trim/zfs-trim@.service similarity index 100% rename from playbooks/system/roles/zfs/files/trim/zfs-trim@.service rename to playbooks/roles/system/zfs/files/trim/zfs-trim@.service diff --git a/playbooks/system/roles/zfs/meta/argument_specs.yml b/playbooks/roles/system/zfs/meta/argument_specs.yml similarity index 100% rename from playbooks/system/roles/zfs/meta/argument_specs.yml rename to playbooks/roles/system/zfs/meta/argument_specs.yml diff --git a/playbooks/system/roles/zfs/tasks/include/conf.yml b/playbooks/roles/system/zfs/tasks/include/conf.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/conf.yml rename to playbooks/roles/system/zfs/tasks/include/conf.yml diff --git a/playbooks/system/roles/zfs/tasks/include/cron.yml b/playbooks/roles/system/zfs/tasks/include/cron.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/cron.yml rename to playbooks/roles/system/zfs/tasks/include/cron.yml diff --git a/playbooks/system/roles/zfs/tasks/include/fstrim.yml b/playbooks/roles/system/zfs/tasks/include/fstrim.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/fstrim.yml rename to playbooks/roles/system/zfs/tasks/include/fstrim.yml diff --git a/playbooks/system/roles/zfs/tasks/include/load_key.yml b/playbooks/roles/system/zfs/tasks/include/load_key.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/load_key.yml rename to playbooks/roles/system/zfs/tasks/include/load_key.yml diff --git a/playbooks/system/roles/zfs/tasks/include/scrub.yml b/playbooks/roles/system/zfs/tasks/include/scrub.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/scrub.yml rename to playbooks/roles/system/zfs/tasks/include/scrub.yml diff --git a/playbooks/system/roles/zfs/tasks/include/trim.yml b/playbooks/roles/system/zfs/tasks/include/trim.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/include/trim.yml rename to playbooks/roles/system/zfs/tasks/include/trim.yml diff --git a/playbooks/system/roles/zfs/tasks/main.yml b/playbooks/roles/system/zfs/tasks/main.yml similarity index 100% rename from playbooks/system/roles/zfs/tasks/main.yml rename to playbooks/roles/system/zfs/tasks/main.yml diff --git a/playbooks/system/roles/zfs/templates/scrub/systemd-mail-zpool-status.j2 b/playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status.j2 similarity index 100% rename from playbooks/system/roles/zfs/templates/scrub/systemd-mail-zpool-status.j2 rename to playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status.j2 diff --git a/playbooks/vpn/roles/base/files/ip-link-add.sh b/playbooks/roles/vpn/base/files/ip-link-add.sh similarity index 100% rename from playbooks/vpn/roles/base/files/ip-link-add.sh rename to playbooks/roles/vpn/base/files/ip-link-add.sh diff --git a/playbooks/vpn/roles/base/tasks/main.yml b/playbooks/roles/vpn/base/tasks/main.yml similarity index 100% rename from playbooks/vpn/roles/base/tasks/main.yml rename to playbooks/roles/vpn/base/tasks/main.yml diff --git a/playbooks/vpn/roles/bridge/files/pre-down-br0-inet.nft b/playbooks/roles/vpn/bridge/files/pre-down-br0-inet.nft similarity index 100% rename from playbooks/vpn/roles/bridge/files/pre-down-br0-inet.nft rename to playbooks/roles/vpn/bridge/files/pre-down-br0-inet.nft diff --git a/playbooks/vpn/roles/bridge/files/pre-down-br0-ipv4.nft b/playbooks/roles/vpn/bridge/files/pre-down-br0-ipv4.nft similarity index 100% rename from playbooks/vpn/roles/bridge/files/pre-down-br0-ipv4.nft rename to playbooks/roles/vpn/bridge/files/pre-down-br0-ipv4.nft diff --git a/playbooks/vpn/roles/bridge/meta/argument_specs.yml b/playbooks/roles/vpn/bridge/meta/argument_specs.yml similarity index 100% rename from playbooks/vpn/roles/bridge/meta/argument_specs.yml rename to playbooks/roles/vpn/bridge/meta/argument_specs.yml diff --git a/playbooks/vpn/roles/bridge/tasks/main.yml b/playbooks/roles/vpn/bridge/tasks/main.yml similarity index 100% rename from playbooks/vpn/roles/bridge/tasks/main.yml rename to playbooks/roles/vpn/bridge/tasks/main.yml diff --git a/playbooks/vpn/roles/bridge/templates/br0.j2 b/playbooks/roles/vpn/bridge/templates/br0.j2 similarity index 100% rename from playbooks/vpn/roles/bridge/templates/br0.j2 rename to playbooks/roles/vpn/bridge/templates/br0.j2 diff --git a/playbooks/vpn/roles/bridge/templates/post-up-br0-inet.nft.j2 b/playbooks/roles/vpn/bridge/templates/post-up-br0-inet.nft.j2 similarity index 100% rename from playbooks/vpn/roles/bridge/templates/post-up-br0-inet.nft.j2 rename to playbooks/roles/vpn/bridge/templates/post-up-br0-inet.nft.j2 diff --git a/playbooks/vpn/roles/bridge/templates/post-up-br0-ipv4.nft.j2 b/playbooks/roles/vpn/bridge/templates/post-up-br0-ipv4.nft.j2 similarity index 100% rename from playbooks/vpn/roles/bridge/templates/post-up-br0-ipv4.nft.j2 rename to playbooks/roles/vpn/bridge/templates/post-up-br0-ipv4.nft.j2 diff --git a/playbooks/vpn/roles/wireguard/files/pre-down-wg0-inet.nft b/playbooks/roles/vpn/wireguard/files/pre-down-wg0-inet.nft similarity index 100% rename from playbooks/vpn/roles/wireguard/files/pre-down-wg0-inet.nft rename to playbooks/roles/vpn/wireguard/files/pre-down-wg0-inet.nft diff --git a/playbooks/vpn/roles/wireguard/files/pre-down-wg0-ipv4.nft b/playbooks/roles/vpn/wireguard/files/pre-down-wg0-ipv4.nft similarity index 100% rename from playbooks/vpn/roles/wireguard/files/pre-down-wg0-ipv4.nft rename to playbooks/roles/vpn/wireguard/files/pre-down-wg0-ipv4.nft diff --git a/playbooks/vpn/roles/wireguard/meta/argument_specs.yml b/playbooks/roles/vpn/wireguard/meta/argument_specs.yml similarity index 100% rename from playbooks/vpn/roles/wireguard/meta/argument_specs.yml rename to playbooks/roles/vpn/wireguard/meta/argument_specs.yml diff --git a/playbooks/vpn/roles/wireguard/tasks/main.yml b/playbooks/roles/vpn/wireguard/tasks/main.yml similarity index 100% rename from playbooks/vpn/roles/wireguard/tasks/main.yml rename to playbooks/roles/vpn/wireguard/tasks/main.yml diff --git a/playbooks/vpn/roles/wireguard/templates/post-up-wg0-inet.nft.j2 b/playbooks/roles/vpn/wireguard/templates/post-up-wg0-inet.nft.j2 similarity index 100% rename from playbooks/vpn/roles/wireguard/templates/post-up-wg0-inet.nft.j2 rename to playbooks/roles/vpn/wireguard/templates/post-up-wg0-inet.nft.j2 diff --git a/playbooks/vpn/roles/wireguard/templates/post-up-wg0-ipv4.nft.j2 b/playbooks/roles/vpn/wireguard/templates/post-up-wg0-ipv4.nft.j2 similarity index 100% rename from playbooks/vpn/roles/wireguard/templates/post-up-wg0-ipv4.nft.j2 rename to playbooks/roles/vpn/wireguard/templates/post-up-wg0-ipv4.nft.j2 diff --git a/playbooks/vpn/roles/wireguard/templates/wg0.conf.j2 b/playbooks/roles/vpn/wireguard/templates/wg0.conf.j2 similarity index 100% rename from playbooks/vpn/roles/wireguard/templates/wg0.conf.j2 rename to playbooks/roles/vpn/wireguard/templates/wg0.conf.j2 diff --git a/playbooks/vpn/roles/wireguard/templates/wg0.j2 b/playbooks/roles/vpn/wireguard/templates/wg0.j2 similarity index 100% rename from playbooks/vpn/roles/wireguard/templates/wg0.j2 rename to playbooks/roles/vpn/wireguard/templates/wg0.j2 diff --git a/playbooks/services/main.yml b/playbooks/services.yml similarity index 89% rename from playbooks/services/main.yml rename to playbooks/services.yml index dc6272b..a69c4b0 100644 --- a/playbooks/services/main.yml +++ b/playbooks/services.yml @@ -3,13 +3,13 @@ hosts: "zfs" roles: - - role: "datasets/system" + - role: "services/datasets/system" tags: "services:datasets_system" tasks: - name: "datasets_user" ansible.builtin.include_role: - name: "datasets/user" + name: "services/datasets/user" apply: tags: - "services:{{ services_service_name }}" @@ -25,13 +25,13 @@ hosts: "asgard" roles: - - role: "setup/system" + - role: "services/setup/system" tags: "services:setup_system" tasks: - name: "setup_user" ansible.builtin.include_role: - name: "setup/user" + name: "services/setup/user" apply: tags: - "services:{{ services_service_name }}" @@ -45,7 +45,7 @@ - name: "deploy" ansible.builtin.include_role: - name: "deploy/{{ services_service_name }}" + name: "services/deploy/{{ services_service_name }}" apply: tags: - "services:{{ services_service_name }}" @@ -61,14 +61,14 @@ hosts: "yggdrasil" roles: - - role: "datasets/backups/system" + - role: "services/datasets/backups/system" when: the_nine_worlds_production | bool tags: "services:datasets_backups_system" tasks: - name: "datasets_backups_user" ansible.builtin.include_role: - name: "datasets/backups/user" + name: "services/datasets/backups/user" apply: tags: - "services:{{ services_service_name }}" @@ -83,7 +83,7 @@ - name: "backups" ansible.builtin.include_role: - name: "backups" + name: "services/backups" apply: tags: - "services:{{ services_service_name }}" diff --git a/playbooks/system/main.yml b/playbooks/system.yml similarity index 60% rename from playbooks/system/main.yml rename to playbooks/system.yml index e9137cf..b3e920d 100644 --- a/playbooks/system/main.yml +++ b/playbooks/system.yml @@ -2,32 +2,32 @@ - name: "system : ups" hosts: "ups" roles: - - role: "ups" + - role: "system/ups" tags: "system:ups" - name: "system : smart" hosts: "smart" roles: - - role: "smart" + - role: "system/smart" vars: - system_base_smartd_conf_file: "files/smart/smartd.conf" + system_base_smartd_conf_file: "files/system/smart/smartd.conf" tags: "system:smart" - name: "system : zfs" hosts: "zfs" roles: - - role: "zfs" + - role: "system/zfs" tags: "system:zfs" - name: "system : all" hosts: "all" roles: - - role: "mail" + - role: "system/mail" when: the_nine_worlds_production | bool tags: "system:mail" - - role: "nftables" + - role: "system/nftables" tags: "system:nftables" - - role: "base" + - role: "system/base" vars: - system_base_motd_dir: "files/base/motd" + system_base_motd_dir: "files/system/base/motd" tags: "system:base" diff --git a/playbooks/vpn/main.yml b/playbooks/vpn.yml similarity index 69% rename from playbooks/vpn/main.yml rename to playbooks/vpn.yml index de9b93b..48372e2 100644 --- a/playbooks/vpn/main.yml +++ b/playbooks/vpn.yml @@ -2,13 +2,13 @@ - name: "vpn : all" hosts: "all" roles: - - role: "base" + - role: "vpn/base" tags: "vpn:base" - - role: "wireguard" + - role: "vpn/wireguard" tags: "vpn:wireguard" - name: "vpn : asgard" hosts: "asgard" roles: - - role: "bridge" + - role: "vpn/bridge" tags: "vpn:bridge"