From ade6a8e1e21fd89cfb520eac1240c07b0c7396a2 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 12 Apr 2025 18:51:31 +0200 Subject: [PATCH] Add nginx as a role dependency where required This is pretty much anywhere a LE certificate is needed. Similar for nginx-php for PHP sites. Drop these roles from setup.yml. --- roles/dokuwiki/meta/main.yml | 3 +++ roles/forgejo/meta/main.yml | 2 ++ roles/friwall/meta/main.yml | 2 ++ roles/grafana/meta/main.yml | 2 ++ roles/influxdb/meta/main.yml | 2 ++ roles/kanboard/meta/main.yml | 3 +++ roles/netbox/meta/main.yml | 2 ++ roles/ocserv/meta/main.yml | 2 ++ roles/reverse-proxy/meta/main.yml | 2 ++ roles/synapse/meta/main.yml | 2 ++ roles/unifi/meta/main.yml | 2 ++ setup.yml | 12 ------------ 12 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 roles/dokuwiki/meta/main.yml create mode 100644 roles/forgejo/meta/main.yml create mode 100644 roles/friwall/meta/main.yml create mode 100644 roles/grafana/meta/main.yml create mode 100644 roles/influxdb/meta/main.yml create mode 100644 roles/kanboard/meta/main.yml create mode 100644 roles/netbox/meta/main.yml create mode 100644 roles/ocserv/meta/main.yml create mode 100644 roles/reverse-proxy/meta/main.yml create mode 100644 roles/synapse/meta/main.yml create mode 100644 roles/unifi/meta/main.yml diff --git a/roles/dokuwiki/meta/main.yml b/roles/dokuwiki/meta/main.yml new file mode 100644 index 0000000..6836d2b --- /dev/null +++ b/roles/dokuwiki/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - role: nginx + - role: nginx-php diff --git a/roles/forgejo/meta/main.yml b/roles/forgejo/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/forgejo/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/friwall/meta/main.yml b/roles/friwall/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/friwall/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/grafana/meta/main.yml b/roles/grafana/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/grafana/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/influxdb/meta/main.yml b/roles/influxdb/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/influxdb/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/kanboard/meta/main.yml b/roles/kanboard/meta/main.yml new file mode 100644 index 0000000..6836d2b --- /dev/null +++ b/roles/kanboard/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - role: nginx + - role: nginx-php diff --git a/roles/netbox/meta/main.yml b/roles/netbox/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/netbox/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/ocserv/meta/main.yml b/roles/ocserv/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/ocserv/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/reverse-proxy/meta/main.yml b/roles/reverse-proxy/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/reverse-proxy/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/synapse/meta/main.yml b/roles/synapse/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/synapse/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/roles/unifi/meta/main.yml b/roles/unifi/meta/main.yml new file mode 100644 index 0000000..69891c7 --- /dev/null +++ b/roles/unifi/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: nginx diff --git a/setup.yml b/setup.yml index 3867b8a..bc85778 100644 --- a/setup.yml +++ b/setup.yml @@ -41,32 +41,25 @@ - hosts: doc roles: - - nginx - - nginx-php - dokuwiki - hosts: git roles: - - nginx - forgejo - hosts: kanboard roles: - - nginx - - nginx-php - kanboard - hosts: matrix roles: - postgres - - nginx - synapse vars: user: synapse - hosts: monitor roles: - - nginx - influxdb - grafana @@ -74,28 +67,23 @@ roles: - postgres - redis - - nginx - netbox vars: user: netbox - hosts: unifi roles: - - nginx - unifi - hosts: vrata roles: - - nginx - ocserv - hosts: web-front roles: - - nginx - reverse-proxy - hosts: zid roles: - opensmtpd - - nginx - friwall