Merge subdirectories

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"

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"

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"

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"

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"

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:

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:

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:

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"

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:

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"

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"

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

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"