From 4fb04065f9bbd4d84531cda9ebb9a7b87fecd30a Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Sat, 14 Oct 2023 15:48:51 +0000 Subject: [PATCH] nginx: Rename nginx/server to nginx --- playbooks/dna-gw.yml | 2 +- playbooks/mail.yml | 2 +- playbooks/mqtt.yml | 2 +- playbooks/nms.yml | 2 +- playbooks/ns.yml | 2 +- playbooks/proxy.yml | 2 +- playbooks/relay.yml | 2 +- playbooks/shell.yml | 4 ++-- roles/ansible_host/meta/main.yml | 2 +- roles/certbot/meta/main.yml | 2 +- roles/gitea/meta/main.yml | 2 +- roles/influxdb/meta/main.yml | 2 +- roles/nginx/{server => }/files/dependency.conf | 0 roles/nginx/{server => }/handlers/main.yml | 0 roles/nginx/{server => }/meta/main.yml | 0 roles/nginx/{server => }/tasks/main.yml | 0 roles/nginx/{server => }/templates/nginx-logrotate.sh | 0 roles/nginx/{server => }/templates/nginx.conf.j2 | 2 +- roles/nginx/{server => }/vars/OpenBSD.yml | 0 roles/nginx/{server => }/vars/RedHat.yml | 0 roles/podman/meta/main.yml | 2 +- roles/prometheus/meta/main.yml | 2 +- 22 files changed, 16 insertions(+), 16 deletions(-) rename roles/nginx/{server => }/files/dependency.conf (100%) rename roles/nginx/{server => }/handlers/main.yml (100%) rename roles/nginx/{server => }/meta/main.yml (100%) rename roles/nginx/{server => }/tasks/main.yml (100%) rename roles/nginx/{server => }/templates/nginx-logrotate.sh (100%) rename roles/nginx/{server => }/templates/nginx.conf.j2 (98%) rename roles/nginx/{server => }/vars/OpenBSD.yml (100%) rename roles/nginx/{server => }/vars/RedHat.yml (100%) diff --git a/playbooks/dna-gw.yml b/playbooks/dna-gw.yml index 7e1d9d0..fe74b0c 100644 --- a/playbooks/dna-gw.yml +++ b/playbooks/dna-gw.yml @@ -16,7 +16,7 @@ - base - ifstated - dhcpd - - nginx/server + - nginx - role: nginx_site nginx_site_name: gw.home.foo.sh - tftp diff --git a/playbooks/mail.yml b/playbooks/mail.yml index 1289c52..cb72de2 100644 --- a/playbooks/mail.yml +++ b/playbooks/mail.yml @@ -33,7 +33,7 @@ - sssd - autofs - dovecot - - role: nginx/server + - role: nginx - role: nginx_site nginx_site_name: "{{ mail_server }}" nginx_site_redirect: https://webmail.foo.sh/ diff --git a/playbooks/mqtt.yml b/playbooks/mqtt.yml index 3b59540..6c92d03 100644 --- a/playbooks/mqtt.yml +++ b/playbooks/mqtt.yml @@ -13,6 +13,6 @@ - base - mosquitto - telegraf - - nginx/server + - nginx - role: nginx_site nginx_site_name: iot.foo.sh diff --git a/playbooks/nms.yml b/playbooks/nms.yml index 36bd7b8..e20f3e3 100644 --- a/playbooks/nms.yml +++ b/playbooks/nms.yml @@ -25,7 +25,7 @@ roles: - base - - nginx/server + - nginx - role: nginx_site nginx_site_name: oob.foo.sh - sssd diff --git a/playbooks/ns.yml b/playbooks/ns.yml index 43508a3..a7476ca 100644 --- a/playbooks/ns.yml +++ b/playbooks/ns.yml @@ -15,7 +15,7 @@ roles: - base - nsd - - role: nginx/server + - role: nginx - role: nginx_site nginx_site_name: "{{ nsd_server }}" nginx_site_redirect: https://www.foo.sh/ diff --git a/playbooks/proxy.yml b/playbooks/proxy.yml index 72096f6..b1c0de0 100644 --- a/playbooks/proxy.yml +++ b/playbooks/proxy.yml @@ -15,7 +15,7 @@ roles: - base - ifstated - - nginx/server + - nginx - role: nginx_site nginx_site_name: ca.foo.sh - role: nginx_site diff --git a/playbooks/relay.yml b/playbooks/relay.yml index a7cd0b4..0d0e8b8 100644 --- a/playbooks/relay.yml +++ b/playbooks/relay.yml @@ -16,7 +16,7 @@ - base - ifstated - relayd - - nginx/server + - nginx - role: nginx_site nginx_site_name: ldap.foo.sh nginx_site_redirect: https://www.foo.sh/ diff --git a/playbooks/shell.yml b/playbooks/shell.yml index 1380081..7eee3e4 100644 --- a/playbooks/shell.yml +++ b/playbooks/shell.yml @@ -25,8 +25,8 @@ - epel_repo - foosh_repo - powertools_repo - - role: nginx/server - plaintext: true + - role: nginx + nginx_plaintext: true tasks: - name: Install extra package groups diff --git a/roles/ansible_host/meta/main.yml b/roles/ansible_host/meta/main.yml index 27b9b1f..516a2dd 100644 --- a/roles/ansible_host/meta/main.yml +++ b/roles/ansible_host/meta/main.yml @@ -2,4 +2,4 @@ dependencies: - {role: epel_repo} - {role: git} - - {role: nginx/server} + - {role: nginx} diff --git a/roles/certbot/meta/main.yml b/roles/certbot/meta/main.yml index b95ceec..954fabd 100644 --- a/roles/certbot/meta/main.yml +++ b/roles/certbot/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - {role: nginx/server} + - {role: nginx} diff --git a/roles/gitea/meta/main.yml b/roles/gitea/meta/main.yml index f9c5d0d..d5e8ce4 100644 --- a/roles/gitea/meta/main.yml +++ b/roles/gitea/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - {role: git} - - {role: nginx/server} + - {role: nginx} diff --git a/roles/influxdb/meta/main.yml b/roles/influxdb/meta/main.yml index b95ceec..954fabd 100644 --- a/roles/influxdb/meta/main.yml +++ b/roles/influxdb/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - {role: nginx/server} + - {role: nginx} diff --git a/roles/nginx/server/files/dependency.conf b/roles/nginx/files/dependency.conf similarity index 100% rename from roles/nginx/server/files/dependency.conf rename to roles/nginx/files/dependency.conf diff --git a/roles/nginx/server/handlers/main.yml b/roles/nginx/handlers/main.yml similarity index 100% rename from roles/nginx/server/handlers/main.yml rename to roles/nginx/handlers/main.yml diff --git a/roles/nginx/server/meta/main.yml b/roles/nginx/meta/main.yml similarity index 100% rename from roles/nginx/server/meta/main.yml rename to roles/nginx/meta/main.yml diff --git a/roles/nginx/server/tasks/main.yml b/roles/nginx/tasks/main.yml similarity index 100% rename from roles/nginx/server/tasks/main.yml rename to roles/nginx/tasks/main.yml diff --git a/roles/nginx/server/templates/nginx-logrotate.sh b/roles/nginx/templates/nginx-logrotate.sh similarity index 100% rename from roles/nginx/server/templates/nginx-logrotate.sh rename to roles/nginx/templates/nginx-logrotate.sh diff --git a/roles/nginx/server/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 similarity index 98% rename from roles/nginx/server/templates/nginx.conf.j2 rename to roles/nginx/templates/nginx.conf.j2 index 877fc4e..4a10039 100644 --- a/roles/nginx/server/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -28,7 +28,7 @@ http { proxy_set_header X-Forwarded-Proto $scheme; proxy_http_version 1.1; -{% if plaintext is defined %} +{% if nginx_plaintext is defined %} server { listen 80; listen [::]:80; diff --git a/roles/nginx/server/vars/OpenBSD.yml b/roles/nginx/vars/OpenBSD.yml similarity index 100% rename from roles/nginx/server/vars/OpenBSD.yml rename to roles/nginx/vars/OpenBSD.yml diff --git a/roles/nginx/server/vars/RedHat.yml b/roles/nginx/vars/RedHat.yml similarity index 100% rename from roles/nginx/server/vars/RedHat.yml rename to roles/nginx/vars/RedHat.yml diff --git a/roles/podman/meta/main.yml b/roles/podman/meta/main.yml index b95ceec..954fabd 100644 --- a/roles/podman/meta/main.yml +++ b/roles/podman/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - {role: nginx/server} + - {role: nginx} diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml index b95ceec..954fabd 100644 --- a/roles/prometheus/meta/main.yml +++ b/roles/prometheus/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - {role: nginx/server} + - {role: nginx}