diff --git a/roles/2px-apache2/meta/main.yml b/roles/2px-apache2/meta/main.yml index c13eea3..f767322 100644 --- a/roles/2px-apache2/meta/main.yml +++ b/roles/2px-apache2/meta/main.yml @@ -1,3 +1,3 @@ dependencies: - - role: install-apache2 + - role: setup-apache2 - role: certbot diff --git a/roles/2px-mariadb/meta/main.yml b/roles/2px-mariadb/meta/main.yml index af8cf5d..b1b6bef 100644 --- a/roles/2px-mariadb/meta/main.yml +++ b/roles/2px-mariadb/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - role: install-mariadb + - role: setup-mariadb diff --git a/roles/certbot/meta/main.yml b/roles/certbot/meta/main.yml index f70eb6d..50ded35 100644 --- a/roles/certbot/meta/main.yml +++ b/roles/certbot/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - role: install-nftables + - role: setup-nftables diff --git a/roles/install-apache2/tasks/main.yml b/roles/setup-apache2/tasks/main.yml similarity index 100% rename from roles/install-apache2/tasks/main.yml rename to roles/setup-apache2/tasks/main.yml diff --git a/roles/install-mariadb/tasks/main.yml b/roles/setup-mariadb/tasks/main.yml similarity index 100% rename from roles/install-mariadb/tasks/main.yml rename to roles/setup-mariadb/tasks/main.yml diff --git a/roles/install-nftables/files/input.d/ssh.conf b/roles/setup-nftables/files/input.d/ssh.conf similarity index 100% rename from roles/install-nftables/files/input.d/ssh.conf rename to roles/setup-nftables/files/input.d/ssh.conf diff --git a/roles/install-nftables/files/netfilter.logrotate b/roles/setup-nftables/files/netfilter.logrotate similarity index 100% rename from roles/install-nftables/files/netfilter.logrotate rename to roles/setup-nftables/files/netfilter.logrotate diff --git a/roles/install-nftables/files/netfilter.rsyslog b/roles/setup-nftables/files/netfilter.rsyslog similarity index 100% rename from roles/install-nftables/files/netfilter.rsyslog rename to roles/setup-nftables/files/netfilter.rsyslog diff --git a/roles/install-nftables/files/nftables.conf b/roles/setup-nftables/files/nftables.conf similarity index 100% rename from roles/install-nftables/files/nftables.conf rename to roles/setup-nftables/files/nftables.conf diff --git a/roles/install-nftables/files/output.d/dhclient.conf b/roles/setup-nftables/files/output.d/dhclient.conf similarity index 100% rename from roles/install-nftables/files/output.d/dhclient.conf rename to roles/setup-nftables/files/output.d/dhclient.conf diff --git a/roles/install-nftables/files/post-hooks.d/fail2ban b/roles/setup-nftables/files/post-hooks.d/fail2ban similarity index 100% rename from roles/install-nftables/files/post-hooks.d/fail2ban rename to roles/setup-nftables/files/post-hooks.d/fail2ban diff --git a/roles/install-nftables/files/systemd-local.conf b/roles/setup-nftables/files/systemd-local.conf similarity index 100% rename from roles/install-nftables/files/systemd-local.conf rename to roles/setup-nftables/files/systemd-local.conf diff --git a/roles/install-nftables/meta/main.yml b/roles/setup-nftables/meta/main.yml similarity index 100% rename from roles/install-nftables/meta/main.yml rename to roles/setup-nftables/meta/main.yml diff --git a/roles/install-nftables/tasks/main.yml b/roles/setup-nftables/tasks/main.yml similarity index 100% rename from roles/install-nftables/tasks/main.yml rename to roles/setup-nftables/tasks/main.yml diff --git a/roles/tunuifranken-apache2/meta/main.yml b/roles/tunuifranken-apache2/meta/main.yml index c13eea3..f767322 100644 --- a/roles/tunuifranken-apache2/meta/main.yml +++ b/roles/tunuifranken-apache2/meta/main.yml @@ -1,3 +1,3 @@ dependencies: - - role: install-apache2 + - role: setup-apache2 - role: certbot