Feat: Declare dependencies between roles

Also remove dependent roles from playbooks.

diff --git a/playbooks/debian/init-system.yml b/playbooks/debian/init-system.yml
index 1015ebd973b8554b816146722902889ad38875e8..ad82015cdd6cf1a7190d71b0d1012af7c95d30ed 100644 (file)
--- a/playbooks/debian/init-system.yml
+++ b/playbooks/debian/init-system.yml
@@ -2,6 +2,5 @@
   hosts: "{{ hosts | default('servers') }}"
   gather_facts: false
   roles:
-    - init-system
     - sudo
     - phd

diff --git a/playbooks/debian/roles/add-apache-vhost/meta/main.yml b/playbooks/debian/roles/add-apache-vhost/meta/main.yml
index 342147eacfb99665798e6f3e4dfd278d05a35774..99e61b3142f39682ab7404a81fab7404b8109d29 100644 (file)
--- a/playbooks/debian/roles/add-apache-vhost/meta/main.yml
+++ b/playbooks/debian/roles/add-apache-vhost/meta/main.yml
@@ -1 +1 @@
-dependencies: ['install-dehydrated']
+dependencies: ['apache', 'install-dehydrated']

diff --git a/playbooks/debian/roles/apache/meta/main.yml b/playbooks/debian/roles/apache/meta/main.yml
new file mode 100644 (file)
index 0000000..ee83d2b
--- /dev/null
+++ b/playbooks/debian/roles/apache/meta/main.yml
@@ -0,0 +1 @@
+dependencies: ['firewall', 'logcheck']

diff --git a/playbooks/debian/roles/install-dehydrated/meta/main.yml b/playbooks/debian/roles/install-dehydrated/meta/main.yml
new file mode 100644 (file)
index 0000000..c84c3cf
--- /dev/null
+++ b/playbooks/debian/roles/install-dehydrated/meta/main.yml
@@ -0,0 +1 @@
+dependencies: ['apache']

diff --git a/playbooks/debian/roles/phd/meta/main.yml b/playbooks/debian/roles/phd/meta/main.yml
new file mode 100644 (file)
index 0000000..8f82bb2
--- /dev/null
+++ b/playbooks/debian/roles/phd/meta/main.yml
@@ -0,0 +1 @@
+dependencies: ['init-system']

diff --git a/playbooks/debian/roles/root/meta/main.yml b/playbooks/debian/roles/root/meta/main.yml
new file mode 100644 (file)
index 0000000..3c93994
--- /dev/null
+++ b/playbooks/debian/roles/root/meta/main.yml
@@ -0,0 +1 @@
+dependencies: ['phd']

diff --git a/playbooks/debian/roles/sudo/meta/main.yml b/playbooks/debian/roles/sudo/meta/main.yml
new file mode 100644 (file)
index 0000000..8f82bb2
--- /dev/null
+++ b/playbooks/debian/roles/sudo/meta/main.yml
@@ -0,0 +1 @@
+dependencies: ['init-system']