From 2108702a2bcabbe77c2a46b220476fc8ad3ca9d7 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 9 Jul 2025 04:35:21 +0200 Subject: [PATCH] Shortened network- to net- --- roles/README.md | 4 ++-- roles/{network-dns-records => net-dns-records}/README.md | 0 .../{network-dns-records => net-dns-records}/meta/main.yml | 0 .../{network-dns-records => net-dns-records}/tasks/main.yml | 0 roles/{network-letsencrypt => net-letsencrypt}/README.md | 0 roles/{network-letsencrypt => net-letsencrypt}/TODO.md | 0 .../{network-letsencrypt => net-letsencrypt}/meta/main.yml | 0 .../{network-letsencrypt => net-letsencrypt}/tasks/main.yml | 0 .../tasks/set-caa-records.yml | 0 .../templates/letsencrypt.conf.j2 | 0 .../templates/ssl_credentials.j2 | 0 .../templates/ssl_header.j2 | 2 +- .../{network-letsencrypt => net-letsencrypt}/vars/main.yml | 0 .../Administration.md | 0 .../README.md | 0 .../files/wireguard-ip.conf | 0 .../handlers/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../README.md | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../Administration.md | 0 .../README.md | 0 .../files/set-mtu.service | 0 .../handlers/main.yml | 0 .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../templates/set-mtu.sh.j2 | 0 roles/service-openldap/templates/nginx.stream.conf.j2 | 2 +- roles/srv-web-https/README.md | 2 +- roles/srv-web-https/meta/main.yml | 2 +- roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 | 2 +- roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2 | 2 +- roles/web-app-collabora/templates/nginx.conf.j2 | 2 +- roles/web-app-gitea/tasks/main.yml | 2 +- roles/web-app-matrix/templates/nginx.conf.j2 | 2 +- roles/web-app-nextcloud/templates/nginx/host.conf.j2 | 2 +- roles/web-app-peertube/templates/peertube.conf.j2 | 2 +- roles/web-app-portfolio/templates/menu/followus.yml.j2 | 2 +- roles/web-app-syncope/templates/proxy.conf | 2 +- .../templates/redirect.domain.nginx.conf.j2 | 2 +- roles/web-redirect-www/tasks/main.yml | 2 +- roles/web-service-files/templates/nginx.conf.j2 | 2 +- roles/web-service-html/templates/nginx.conf.j2 | 2 +- tasks/plays/01_constructor.yml | 6 +++--- 46 files changed, 25 insertions(+), 25 deletions(-) rename roles/{network-dns-records => net-dns-records}/README.md (100%) rename roles/{network-dns-records => net-dns-records}/meta/main.yml (100%) rename roles/{network-dns-records => net-dns-records}/tasks/main.yml (100%) rename roles/{network-letsencrypt => net-letsencrypt}/README.md (100%) rename roles/{network-letsencrypt => net-letsencrypt}/TODO.md (100%) rename roles/{network-letsencrypt => net-letsencrypt}/meta/main.yml (100%) rename roles/{network-letsencrypt => net-letsencrypt}/tasks/main.yml (100%) rename roles/{network-letsencrypt => net-letsencrypt}/tasks/set-caa-records.yml (100%) rename roles/{network-letsencrypt => net-letsencrypt}/templates/letsencrypt.conf.j2 (100%) rename roles/{network-letsencrypt => net-letsencrypt}/templates/ssl_credentials.j2 (100%) rename roles/{network-letsencrypt => net-letsencrypt}/templates/ssl_header.j2 (87%) rename roles/{network-letsencrypt => net-letsencrypt}/vars/main.yml (100%) rename roles/{network-wireguard-core => net-wireguard-core}/Administration.md (100%) rename roles/{network-wireguard-core => net-wireguard-core}/README.md (100%) rename roles/{network-wireguard-core => net-wireguard-core}/files/wireguard-ip.conf (100%) rename roles/{network-wireguard-core => net-wireguard-core}/handlers/main.yml (100%) rename roles/{network-wireguard-core => net-wireguard-core}/meta/main.yml (100%) rename roles/{network-wireguard-core => net-wireguard-core}/tasks/main.yml (100%) rename roles/{network-wireguard-firewalled => net-wireguard-firewalled}/README.md (86%) rename roles/{network-wireguard-firewalled => net-wireguard-firewalled}/meta/main.yml (96%) rename roles/{network-wireguard-firewalled => net-wireguard-firewalled}/tasks/main.yml (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/Administration.md (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/README.md (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/files/set-mtu.service (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/handlers/main.yml (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/meta/main.yml (96%) rename roles/{network-wireguard-plain => net-wireguard-plain}/tasks/main.yml (100%) rename roles/{network-wireguard-plain => net-wireguard-plain}/templates/set-mtu.sh.j2 (100%) diff --git a/roles/README.md b/roles/README.md index 07188a71..e26c28a0 100644 --- a/roles/README.md +++ b/roles/README.md @@ -49,7 +49,7 @@ For a complete list of role categories and detailed definitions, see: ## Network -- **network-*** +- **net-*** Network infrastructure (DNS records, WireGuard, Let’s Encrypt entrypoints). - **service-*** @@ -112,7 +112,7 @@ For a complete list of role categories and detailed definitions, see: > **Tip:** To find a role quickly, search for its prefix: > `core-`, `gen-`, `desk-`, `srv-web-`, `web-service-`, `web-app-`, -> `network-`, `service-`, `monitor-`, `alert-`, `maint-`, `cln-`, +> `net-`, `service-`, `monitor-`, `alert-`, `maint-`, `cln-`, > `bkp-`, `update-`, `pkgmgr-`, `user-`. --- diff --git a/roles/network-dns-records/README.md b/roles/net-dns-records/README.md similarity index 100% rename from roles/network-dns-records/README.md rename to roles/net-dns-records/README.md diff --git a/roles/network-dns-records/meta/main.yml b/roles/net-dns-records/meta/main.yml similarity index 100% rename from roles/network-dns-records/meta/main.yml rename to roles/net-dns-records/meta/main.yml diff --git a/roles/network-dns-records/tasks/main.yml b/roles/net-dns-records/tasks/main.yml similarity index 100% rename from roles/network-dns-records/tasks/main.yml rename to roles/net-dns-records/tasks/main.yml diff --git a/roles/network-letsencrypt/README.md b/roles/net-letsencrypt/README.md similarity index 100% rename from roles/network-letsencrypt/README.md rename to roles/net-letsencrypt/README.md diff --git a/roles/network-letsencrypt/TODO.md b/roles/net-letsencrypt/TODO.md similarity index 100% rename from roles/network-letsencrypt/TODO.md rename to roles/net-letsencrypt/TODO.md diff --git a/roles/network-letsencrypt/meta/main.yml b/roles/net-letsencrypt/meta/main.yml similarity index 100% rename from roles/network-letsencrypt/meta/main.yml rename to roles/net-letsencrypt/meta/main.yml diff --git a/roles/network-letsencrypt/tasks/main.yml b/roles/net-letsencrypt/tasks/main.yml similarity index 100% rename from roles/network-letsencrypt/tasks/main.yml rename to roles/net-letsencrypt/tasks/main.yml diff --git a/roles/network-letsencrypt/tasks/set-caa-records.yml b/roles/net-letsencrypt/tasks/set-caa-records.yml similarity index 100% rename from roles/network-letsencrypt/tasks/set-caa-records.yml rename to roles/net-letsencrypt/tasks/set-caa-records.yml diff --git a/roles/network-letsencrypt/templates/letsencrypt.conf.j2 b/roles/net-letsencrypt/templates/letsencrypt.conf.j2 similarity index 100% rename from roles/network-letsencrypt/templates/letsencrypt.conf.j2 rename to roles/net-letsencrypt/templates/letsencrypt.conf.j2 diff --git a/roles/network-letsencrypt/templates/ssl_credentials.j2 b/roles/net-letsencrypt/templates/ssl_credentials.j2 similarity index 100% rename from roles/network-letsencrypt/templates/ssl_credentials.j2 rename to roles/net-letsencrypt/templates/ssl_credentials.j2 diff --git a/roles/network-letsencrypt/templates/ssl_header.j2 b/roles/net-letsencrypt/templates/ssl_header.j2 similarity index 87% rename from roles/network-letsencrypt/templates/ssl_header.j2 rename to roles/net-letsencrypt/templates/ssl_header.j2 index e0fab1e6..1e254e6f 100644 --- a/roles/network-letsencrypt/templates/ssl_header.j2 +++ b/roles/net-letsencrypt/templates/ssl_header.j2 @@ -12,4 +12,4 @@ ssl_session_tickets on; add_header Strict-Transport-Security max-age=15768000; ssl_stapling on; ssl_stapling_verify on; -{% include 'roles/network-letsencrypt/templates/ssl_credentials.j2' %} \ No newline at end of file +{% include 'roles/net-letsencrypt/templates/ssl_credentials.j2' %} \ No newline at end of file diff --git a/roles/network-letsencrypt/vars/main.yml b/roles/net-letsencrypt/vars/main.yml similarity index 100% rename from roles/network-letsencrypt/vars/main.yml rename to roles/net-letsencrypt/vars/main.yml diff --git a/roles/network-wireguard-core/Administration.md b/roles/net-wireguard-core/Administration.md similarity index 100% rename from roles/network-wireguard-core/Administration.md rename to roles/net-wireguard-core/Administration.md diff --git a/roles/network-wireguard-core/README.md b/roles/net-wireguard-core/README.md similarity index 100% rename from roles/network-wireguard-core/README.md rename to roles/net-wireguard-core/README.md diff --git a/roles/network-wireguard-core/files/wireguard-ip.conf b/roles/net-wireguard-core/files/wireguard-ip.conf similarity index 100% rename from roles/network-wireguard-core/files/wireguard-ip.conf rename to roles/net-wireguard-core/files/wireguard-ip.conf diff --git a/roles/network-wireguard-core/handlers/main.yml b/roles/net-wireguard-core/handlers/main.yml similarity index 100% rename from roles/network-wireguard-core/handlers/main.yml rename to roles/net-wireguard-core/handlers/main.yml diff --git a/roles/network-wireguard-core/meta/main.yml b/roles/net-wireguard-core/meta/main.yml similarity index 100% rename from roles/network-wireguard-core/meta/main.yml rename to roles/net-wireguard-core/meta/main.yml diff --git a/roles/network-wireguard-core/tasks/main.yml b/roles/net-wireguard-core/tasks/main.yml similarity index 100% rename from roles/network-wireguard-core/tasks/main.yml rename to roles/net-wireguard-core/tasks/main.yml diff --git a/roles/network-wireguard-firewalled/README.md b/roles/net-wireguard-firewalled/README.md similarity index 86% rename from roles/network-wireguard-firewalled/README.md rename to roles/net-wireguard-firewalled/README.md index adf805b3..f7400ea7 100644 --- a/roles/network-wireguard-firewalled/README.md +++ b/roles/net-wireguard-firewalled/README.md @@ -19,7 +19,7 @@ The primary purpose of this role is to enable proper routing and connectivity fo - **iptables Rule Adaptation:** Modifies iptables to allow forwarding and NAT masquerading for the WireGuard client. - **NAT Support:** Configures the external interface for proper masquerading. -- **Role Integration:** Depends on the [network-wireguard-plain](../network-wireguard-plain/README.md) role to ensure that WireGuard is properly configured before applying firewall rules. +- **Role Integration:** Depends on the [net-wireguard-plain](../net-wireguard-plain/README.md) role to ensure that WireGuard is properly configured before applying firewall rules. ## Other Resources - https://gist.github.com/insdavm/b1034635ab23b8839bf957aa406b5e39 diff --git a/roles/network-wireguard-firewalled/meta/main.yml b/roles/net-wireguard-firewalled/meta/main.yml similarity index 96% rename from roles/network-wireguard-firewalled/meta/main.yml rename to roles/net-wireguard-firewalled/meta/main.yml index f38eb049..9f2428f3 100644 --- a/roles/network-wireguard-firewalled/meta/main.yml +++ b/roles/net-wireguard-firewalled/meta/main.yml @@ -23,4 +23,4 @@ galaxy_info: issue_tracker_url: "https://s.veen.world/cymaisissues" documentation: "https://s.veen.world/cymais" dependencies: - - network-wireguard-plain \ No newline at end of file + - net-wireguard-plain \ No newline at end of file diff --git a/roles/network-wireguard-firewalled/tasks/main.yml b/roles/net-wireguard-firewalled/tasks/main.yml similarity index 100% rename from roles/network-wireguard-firewalled/tasks/main.yml rename to roles/net-wireguard-firewalled/tasks/main.yml diff --git a/roles/network-wireguard-plain/Administration.md b/roles/net-wireguard-plain/Administration.md similarity index 100% rename from roles/network-wireguard-plain/Administration.md rename to roles/net-wireguard-plain/Administration.md diff --git a/roles/network-wireguard-plain/README.md b/roles/net-wireguard-plain/README.md similarity index 100% rename from roles/network-wireguard-plain/README.md rename to roles/net-wireguard-plain/README.md diff --git a/roles/network-wireguard-plain/files/set-mtu.service b/roles/net-wireguard-plain/files/set-mtu.service similarity index 100% rename from roles/network-wireguard-plain/files/set-mtu.service rename to roles/net-wireguard-plain/files/set-mtu.service diff --git a/roles/network-wireguard-plain/handlers/main.yml b/roles/net-wireguard-plain/handlers/main.yml similarity index 100% rename from roles/network-wireguard-plain/handlers/main.yml rename to roles/net-wireguard-plain/handlers/main.yml diff --git a/roles/network-wireguard-plain/meta/main.yml b/roles/net-wireguard-plain/meta/main.yml similarity index 96% rename from roles/network-wireguard-plain/meta/main.yml rename to roles/net-wireguard-plain/meta/main.yml index aaa3c9c9..a592a8d2 100644 --- a/roles/network-wireguard-plain/meta/main.yml +++ b/roles/net-wireguard-plain/meta/main.yml @@ -24,4 +24,4 @@ galaxy_info: issue_tracker_url: "https://s.veen.world/cymaisissues" documentation: "https://s.veen.world/cymais" dependencies: - - network-wireguard-core + - net-wireguard-core diff --git a/roles/network-wireguard-plain/tasks/main.yml b/roles/net-wireguard-plain/tasks/main.yml similarity index 100% rename from roles/network-wireguard-plain/tasks/main.yml rename to roles/net-wireguard-plain/tasks/main.yml diff --git a/roles/network-wireguard-plain/templates/set-mtu.sh.j2 b/roles/net-wireguard-plain/templates/set-mtu.sh.j2 similarity index 100% rename from roles/network-wireguard-plain/templates/set-mtu.sh.j2 rename to roles/net-wireguard-plain/templates/set-mtu.sh.j2 diff --git a/roles/service-openldap/templates/nginx.stream.conf.j2 b/roles/service-openldap/templates/nginx.stream.conf.j2 index 8fd12a60..0435607a 100644 --- a/roles/service-openldap/templates/nginx.stream.conf.j2 +++ b/roles/service-openldap/templates/nginx.stream.conf.j2 @@ -2,5 +2,5 @@ server { listen {{ports.public.ldaps.ldap}}ssl; proxy_pass 127.0.0.1:{{ports.localhost.ldap.ldap}}; - {% include 'roles/network-letsencrypt/templates/ssl_credentials.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_credentials.j2' %} } diff --git a/roles/srv-web-https/README.md b/roles/srv-web-https/README.md index 6ebc395b..52321e29 100644 --- a/roles/srv-web-https/README.md +++ b/roles/srv-web-https/README.md @@ -17,7 +17,7 @@ When you apply **srv-web-https**, it will: 1. **Include** the `srv-web-core` role to install and configure Nginx. 2. **Clean up** any stale vHost files under `cln-domains`. -3. **Deploy** the Let’s Encrypt challenge-and-redirect snippet from `network-letsencrypt`. +3. **Deploy** the Let’s Encrypt challenge-and-redirect snippet from `net-letsencrypt`. 4. **Reload** Nginx automatically when any template changes. All tasks are idempotent—once your certificates are in place and your configuration is set, Ansible will skip unchanged steps on subsequent runs. diff --git a/roles/srv-web-https/meta/main.yml b/roles/srv-web-https/meta/main.yml index e020c460..41df15c0 100644 --- a/roles/srv-web-https/meta/main.yml +++ b/roles/srv-web-https/meta/main.yml @@ -26,4 +26,4 @@ galaxy_info: dependencies: - srv-web-core - cln-domains - - network-letsencrypt \ No newline at end of file + - net-letsencrypt \ No newline at end of file diff --git a/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 b/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 index e030ab72..69c847b9 100644 --- a/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 +++ b/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 @@ -13,7 +13,7 @@ server {{nginx_docker_reverse_proxy_extra_configuration}} {% endif %} - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% if applications | is_feature_enabled('oauth2', application_id) %} {% set acl = applications[application_id].oauth2_proxy.acl | default({}) %} diff --git a/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2 b/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2 index 50e91a78..8cf22921 100644 --- a/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2 +++ b/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2 @@ -6,7 +6,7 @@ map $http_upgrade $connection_upgrade { server { server_name {{ domain }}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2' %} client_max_body_size {{ client_max_body_size | default('100m') }}; diff --git a/roles/web-app-collabora/templates/nginx.conf.j2 b/roles/web-app-collabora/templates/nginx.conf.j2 index e01a0c3e..260afaa9 100644 --- a/roles/web-app-collabora/templates/nginx.conf.j2 +++ b/roles/web-app-collabora/templates/nginx.conf.j2 @@ -1,7 +1,7 @@ server { server_name {{domain}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} diff --git a/roles/web-app-gitea/tasks/main.yml b/roles/web-app-gitea/tasks/main.yml index cddebdee..4e7b93f3 100644 --- a/roles/web-app-gitea/tasks/main.yml +++ b/roles/web-app-gitea/tasks/main.yml @@ -64,7 +64,7 @@ - name: Include DNS role to register Gitea domain(s) include_role: - name: network-dns-records + name: net-dns-records vars: cloudflare_api_token: "{{ certbot_dns_api_token }}" cloudflare_domains: "{{ [ domains | get_domain(application_id) ] }}" diff --git a/roles/web-app-matrix/templates/nginx.conf.j2 b/roles/web-app-matrix/templates/nginx.conf.j2 index c802c4e9..1319efd6 100644 --- a/roles/web-app-matrix/templates/nginx.conf.j2 +++ b/roles/web-app-matrix/templates/nginx.conf.j2 @@ -5,7 +5,7 @@ server { {% set http_port = ports.localhost.http.synapse %} server_name {{domains.matrix.synapse}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} # For the federation port listen 8448 ssl default_server; diff --git a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 b/roles/web-app-nextcloud/templates/nginx/host.conf.j2 index aaf64d83..3c788687 100644 --- a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 +++ b/roles/web-app-nextcloud/templates/nginx/host.conf.j2 @@ -4,7 +4,7 @@ server { server_name {{domain}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} # Remove X-Powered-By, which is an information leak diff --git a/roles/web-app-peertube/templates/peertube.conf.j2 b/roles/web-app-peertube/templates/peertube.conf.j2 index 4a82e662..86e50a64 100644 --- a/roles/web-app-peertube/templates/peertube.conf.j2 +++ b/roles/web-app-peertube/templates/peertube.conf.j2 @@ -1,7 +1,7 @@ server { server_name {{domain}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} diff --git a/roles/web-app-portfolio/templates/menu/followus.yml.j2 b/roles/web-app-portfolio/templates/menu/followus.yml.j2 index f72a28e3..0d6b9080 100644 --- a/roles/web-app-portfolio/templates/menu/followus.yml.j2 +++ b/roles/web-app-portfolio/templates/menu/followus.yml.j2 @@ -55,7 +55,7 @@ followus: - name: Friendica description: Visit {{ 'our' if service_provider.type == 'legal' else 'my' }} friendica profile icon: - class: fas fa-network-wired + class: fas fa-net-wired identifier: "{{service_provider.contact.friendica}}" url: "{{ web_protocol }}://{{ service_provider.contact.friendica.split('@')[2] }}/@{{ service_provider.contact.friendica.split('@')[1] }}" iframe: {{ applications | is_feature_enabled('portfolio_iframe','friendica') }} diff --git a/roles/web-app-syncope/templates/proxy.conf b/roles/web-app-syncope/templates/proxy.conf index 24f6a46a..4190626a 100644 --- a/roles/web-app-syncope/templates/proxy.conf +++ b/roles/web-app-syncope/templates/proxy.conf @@ -13,7 +13,7 @@ server {{nginx_docker_reverse_proxy_extra_configuration}} {% endif %} - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% for path in syncope_paths.values() %} {% set location = web_protocol ~ '://' ~ domains | get_domain(application_id) ~ '/' ~ path ~ '/' %} diff --git a/roles/web-redirect-domains/templates/redirect.domain.nginx.conf.j2 b/roles/web-redirect-domains/templates/redirect.domain.nginx.conf.j2 index e6446fd6..8ed2363c 100644 --- a/roles/web-redirect-domains/templates/redirect.domain.nginx.conf.j2 +++ b/roles/web-redirect-domains/templates/redirect.domain.nginx.conf.j2 @@ -1,6 +1,6 @@ server { server_name {{ domain }}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} return 301 https://{{ target }}$request_uri; } diff --git a/roles/web-redirect-www/tasks/main.yml b/roles/web-redirect-www/tasks/main.yml index aa12c986..e60f6b7c 100644 --- a/roles/web-redirect-www/tasks/main.yml +++ b/roles/web-redirect-www/tasks/main.yml @@ -17,7 +17,7 @@ - name: Include DNS role to set redirects include_role: - name: network-dns-records + name: net-dns-records vars: cloudflare_api_token: "{{ certbot_dns_api_token }}" cloudflare_domains: "{{ www_domains }}" diff --git a/roles/web-service-files/templates/nginx.conf.j2 b/roles/web-service-files/templates/nginx.conf.j2 index 5a9e0ed2..5b2bc472 100644 --- a/roles/web-service-files/templates/nginx.conf.j2 +++ b/roles/web-service-files/templates/nginx.conf.j2 @@ -2,7 +2,7 @@ server { server_name {{domains | get_domain(application_id)}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} diff --git a/roles/web-service-html/templates/nginx.conf.j2 b/roles/web-service-html/templates/nginx.conf.j2 index 0cf6282a..b81df42a 100644 --- a/roles/web-service-html/templates/nginx.conf.j2 +++ b/roles/web-service-html/templates/nginx.conf.j2 @@ -2,7 +2,7 @@ server { server_name {{domains | get_domain(application_id)}}; - {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} diff --git a/tasks/plays/01_constructor.yml b/tasks/plays/01_constructor.yml index 6c412079..548f0afa 100644 --- a/tasks/plays/01_constructor.yml +++ b/tasks/plays/01_constructor.yml @@ -104,18 +104,18 @@ - name: setup standard wireguard when: ('wireguard_server' | application_allowed(group_names, allowed_applications)) include_role: - name: network-wireguard-core + name: net-wireguard-core # vpn setup - name: setup wireguard client behind firewall\nat when: ('wireguard_behind_firewall' | application_allowed(group_names, allowed_applications)) include_role: - name: network-wireguard-firewalled + name: net-wireguard-firewalled - name: setup wireguard client when: ('wireguard_client' | application_allowed(group_names, allowed_applications)) include_role: - name: network-wireguard-plain + name: net-wireguard-plain ## backup setup - name: setup replica backup hosts