diff --git a/playbook.yml b/playbook.yml index defacfb..e9df7c2 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,6 +1,5 @@ --- - hosts: lime2 roles: - - role: apache-2px - - role: apache-tunuifranken - - role: mariadb-2px + - role: 2px + - role: tunuifranken diff --git a/roles/2px-apache2/meta/main.yml b/roles/2px-apache2/meta/main.yml new file mode 100644 index 0000000..c13eea3 --- /dev/null +++ b/roles/2px-apache2/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - role: install-apache2 + - role: certbot diff --git a/roles/apache-2px/tasks/main.yml b/roles/2px-apache2/tasks/main.yml similarity index 100% rename from roles/apache-2px/tasks/main.yml rename to roles/2px-apache2/tasks/main.yml diff --git a/roles/apache-2px/templates/2px.info.conf.j2 b/roles/2px-apache2/templates/2px.info.conf.j2 similarity index 100% rename from roles/apache-2px/templates/2px.info.conf.j2 rename to roles/2px-apache2/templates/2px.info.conf.j2 diff --git a/roles/apache-2px/vars/main.yml b/roles/2px-apache2/vars/main.yml similarity index 100% rename from roles/apache-2px/vars/main.yml rename to roles/2px-apache2/vars/main.yml diff --git a/roles/2px-mariadb/meta/main.yml b/roles/2px-mariadb/meta/main.yml new file mode 100644 index 0000000..af8cf5d --- /dev/null +++ b/roles/2px-mariadb/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: install-mariadb diff --git a/roles/mariadb-2px/tasks/main.yml b/roles/2px-mariadb/tasks/main.yml similarity index 100% rename from roles/mariadb-2px/tasks/main.yml rename to roles/2px-mariadb/tasks/main.yml diff --git a/roles/mariadb-2px/vars/main.yml b/roles/2px-mariadb/vars/main.yml similarity index 100% rename from roles/mariadb-2px/vars/main.yml rename to roles/2px-mariadb/vars/main.yml diff --git a/roles/mariadb-2px/vars/vault.yml b/roles/2px-mariadb/vars/vault.yml similarity index 100% rename from roles/mariadb-2px/vars/vault.yml rename to roles/2px-mariadb/vars/vault.yml diff --git a/roles/2px/meta/main.yml b/roles/2px/meta/main.yml new file mode 100644 index 0000000..53070e1 --- /dev/null +++ b/roles/2px/meta/main.yml @@ -0,0 +1,4 @@ +dependencies: + - role: common + - role: 2px-apache2 + - role: 2px-mariadb diff --git a/roles/apache-2px/meta/main.yml b/roles/apache-2px/meta/main.yml deleted file mode 100644 index 5563627..0000000 --- a/roles/apache-2px/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - - role: common - - role: apache-install - - role: certbot diff --git a/roles/apache-install/meta/main.yml b/roles/apache-install/meta/main.yml deleted file mode 100644 index 9711b33..0000000 --- a/roles/apache-install/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: common diff --git a/roles/apache-tunuifranken/meta/main.yml b/roles/apache-tunuifranken/meta/main.yml deleted file mode 100644 index 5563627..0000000 --- a/roles/apache-tunuifranken/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - - role: common - - role: apache-install - - role: certbot diff --git a/roles/apache-install/tasks/main.yml b/roles/install-apache2/tasks/main.yml similarity index 100% rename from roles/apache-install/tasks/main.yml rename to roles/install-apache2/tasks/main.yml diff --git a/roles/mariadb-install/tasks/main.yml b/roles/install-mariadb/tasks/main.yml similarity index 100% rename from roles/mariadb-install/tasks/main.yml rename to roles/install-mariadb/tasks/main.yml diff --git a/roles/mariadb-2px/meta/main.yml b/roles/mariadb-2px/meta/main.yml deleted file mode 100644 index 4ead162..0000000 --- a/roles/mariadb-2px/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: - - role: common - - role: mariadb-install diff --git a/roles/tunuifranken-apache2/meta/main.yml b/roles/tunuifranken-apache2/meta/main.yml new file mode 100644 index 0000000..c13eea3 --- /dev/null +++ b/roles/tunuifranken-apache2/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - role: install-apache2 + - role: certbot diff --git a/roles/apache-tunuifranken/tasks/main.yml b/roles/tunuifranken-apache2/tasks/main.yml similarity index 100% rename from roles/apache-tunuifranken/tasks/main.yml rename to roles/tunuifranken-apache2/tasks/main.yml diff --git a/roles/apache-tunuifranken/vars/main.yml b/roles/tunuifranken-apache2/vars/main.yml similarity index 100% rename from roles/apache-tunuifranken/vars/main.yml rename to roles/tunuifranken-apache2/vars/main.yml diff --git a/roles/mariadb-install/meta/main.yml b/roles/tunuifranken/meta/main.yml similarity index 50% rename from roles/mariadb-install/meta/main.yml rename to roles/tunuifranken/meta/main.yml index 9711b33..79f28ca 100644 --- a/roles/mariadb-install/meta/main.yml +++ b/roles/tunuifranken/meta/main.yml @@ -1,2 +1,3 @@ dependencies: - role: common + - role: tunuifranken-apache2