diff --git a/roles/categories.yml b/roles/categories.yml index d88d8b65..1c110915 100644 --- a/roles/categories.yml +++ b/roles/categories.yml @@ -38,7 +38,7 @@ categories: icon: "fas fa-project-diagram" injector: core: - title: "srv-web-injector-core" + title: "srv-web-injector-compose" description: "Inject core HTML modifiers" icon: "fas fa-code" css: diff --git a/roles/srv-web-composer/README.md b/roles/srv-web-composer/README.md index 0b221546..e60e87f5 100644 --- a/roles/srv-web-composer/README.md +++ b/roles/srv-web-composer/README.md @@ -2,7 +2,7 @@ This Ansible role composes and orchestrates all necessary HTTPS-layer tasks and HTML-content injections for your webserver domains. It integrates two key sub-roles into a unified workflow: -1. **`srv-web-injector-core`** +1. **`srv-web-injector-compose`** Injects global HTML snippets (CSS, Matomo tracking, iFrame notifier, custom JavaScript) into responses using Nginx `sub_filter`. 2. **`srv-web-tls-core`** Handles issuing, renewing, and managing TLS certificates via ACME/Certbot. diff --git a/roles/srv-web-composer/meta/main.yml b/roles/srv-web-composer/meta/main.yml index 481a3677..8807c7ae 100644 --- a/roles/srv-web-composer/meta/main.yml +++ b/roles/srv-web-composer/meta/main.yml @@ -29,5 +29,5 @@ galaxy_info: issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/srv-web-composer" dependencies: - - srv-web-injector-core + - srv-web-injector-compose - srv-web-tls-core diff --git a/roles/srv-web-composer/tasks/main.yml b/roles/srv-web-composer/tasks/main.yml index 6e0d41fb..e6f15a1e 100644 --- a/roles/srv-web-composer/tasks/main.yml +++ b/roles/srv-web-composer/tasks/main.yml @@ -1,6 +1,6 @@ -- name: "include role srv-web-injector-core for {{domain}}" +- name: "include role srv-web-injector-compose for {{domain}}" include_role: - name: srv-web-injector-core + name: srv-web-injector-compose - name: "include role srv-web-tls-core for {{domain}}" include_role: diff --git a/roles/srv-web-injector-core/README.md b/roles/srv-web-injector-compose/README.md similarity index 100% rename from roles/srv-web-injector-core/README.md rename to roles/srv-web-injector-compose/README.md diff --git a/roles/srv-web-injector-core/meta/main.yml b/roles/srv-web-injector-compose/meta/main.yml similarity index 83% rename from roles/srv-web-injector-core/meta/main.yml rename to roles/srv-web-injector-compose/meta/main.yml index 0cb559a2..d05832e4 100644 --- a/roles/srv-web-injector-core/meta/main.yml +++ b/roles/srv-web-injector-compose/meta/main.yml @@ -15,14 +15,13 @@ galaxy_info: - theming repository: "https://github.com/kevinveenbirkenbach/cymais" issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" - documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/srv-web-injector-core" + documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/srv-web-injector-compose" min_ansible_version: "2.9" platforms: - name: Any versions: - all dependencies: - - srv-web-injector-matomo - - srv-web-injector-css - - srv-web-injector-iframe - - srv-web-injector-javascript +# The injections are called in the script. Keep the logic there. + - srv-web-core + \ No newline at end of file diff --git a/roles/srv-web-injector-core/tasks/main.yml b/roles/srv-web-injector-compose/tasks/main.yml similarity index 100% rename from roles/srv-web-injector-core/tasks/main.yml rename to roles/srv-web-injector-compose/tasks/main.yml diff --git a/roles/srv-web-injector-core/templates/global.includes.conf.j2 b/roles/srv-web-injector-compose/templates/global.includes.conf.j2 similarity index 100% rename from roles/srv-web-injector-core/templates/global.includes.conf.j2 rename to roles/srv-web-injector-compose/templates/global.includes.conf.j2 diff --git a/roles/srv-web-injector-css/tasks/main.yml b/roles/srv-web-injector-css/tasks/main.yml index f692c159..8d2df24e 100644 --- a/roles/srv-web-injector-css/tasks/main.yml +++ b/roles/srv-web-injector-css/tasks/main.yml @@ -1,4 +1,4 @@ -# Load this role via srv-web-injector-core for consistency +# Load this role via srv-web-injector-compose for consistency - name: Generate color palette with colorscheme-generator set_fact: diff --git a/roles/srv-web-injector-matomo/tasks/main.yml b/roles/srv-web-injector-matomo/tasks/main.yml index 1bf323db..ef4dacd6 100644 --- a/roles/srv-web-injector-matomo/tasks/main.yml +++ b/roles/srv-web-injector-matomo/tasks/main.yml @@ -1,4 +1,4 @@ -# Load this role via srv-web-injector-core for consistency +# Load this role via srv-web-injector-compose for consistency - name: "Relevant variables for role: {{ role_path | basename }}" debug: 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 69c847b9..fb096971 100644 --- a/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 +++ b/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 @@ -6,7 +6,7 @@ server {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%} {% endif %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% if nginx_docker_reverse_proxy_extra_configuration is defined %} {# Additional Domain Specific Configuration #} 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 8cf22921..443c8bb5 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 @@ -7,7 +7,7 @@ server { server_name {{ domain }}; {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2' %} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2' %} client_max_body_size {{ client_max_body_size | default('100m') }}; keepalive_timeout 70; diff --git a/roles/srv-web-proxy-domain/README.md b/roles/srv-web-proxy-domain/README.md index 7579c31d..f7907b6d 100644 --- a/roles/srv-web-proxy-domain/README.md +++ b/roles/srv-web-proxy-domain/README.md @@ -8,7 +8,7 @@ This role bootstraps **per-domain Nginx configuration**: it requests TLS certifi A higher-level orchestration wrapper, *srv-web-proxy-domain* ties together several lower-level roles: -1. **`srv-web-injector-core`** – applies global tweaks and includes. +1. **`srv-web-injector-compose`** – applies global tweaks and includes. 2. **`srv-web-tls-core`** – obtains Let’s Encrypt certificates. 3. **Domain template deployment** – copies a Jinja2 vHost from *srv-web-proxy-core*. 4. **`web-app-oauth2-proxy`** *(optional)* – protects the site with OAuth2. diff --git a/roles/web-app-collabora/templates/nginx.conf.j2 b/roles/web-app-collabora/templates/nginx.conf.j2 index 260afaa9..dadbe90a 100644 --- a/roles/web-app-collabora/templates/nginx.conf.j2 +++ b/roles/web-app-collabora/templates/nginx.conf.j2 @@ -3,7 +3,7 @@ server { {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %} diff --git a/roles/web-app-matrix/templates/nginx.conf.j2 b/roles/web-app-matrix/templates/nginx.conf.j2 index 1319efd6..e9814202 100644 --- a/roles/web-app-matrix/templates/nginx.conf.j2 +++ b/roles/web-app-matrix/templates/nginx.conf.j2 @@ -11,6 +11,6 @@ server { listen 8448 ssl default_server; listen [::]:8448 ssl default_server; - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %} } \ No newline at end of file diff --git a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 b/roles/web-app-nextcloud/templates/nginx/host.conf.j2 index 3c788687..81fdb051 100644 --- a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 +++ b/roles/web-app-nextcloud/templates/nginx/host.conf.j2 @@ -6,7 +6,7 @@ server {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; diff --git a/roles/web-app-peertube/templates/peertube.conf.j2 b/roles/web-app-peertube/templates/peertube.conf.j2 index 86e50a64..9ac7a040 100644 --- a/roles/web-app-peertube/templates/peertube.conf.j2 +++ b/roles/web-app-peertube/templates/peertube.conf.j2 @@ -3,7 +3,7 @@ server { {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %} diff --git a/roles/web-app-syncope/templates/proxy.conf b/roles/web-app-syncope/templates/proxy.conf index 4190626a..eecf3818 100644 --- a/roles/web-app-syncope/templates/proxy.conf +++ b/roles/web-app-syncope/templates/proxy.conf @@ -6,7 +6,7 @@ server {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%} {% endif %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% if nginx_docker_reverse_proxy_extra_configuration is defined %} {# Additional Domain Specific Configuration #} diff --git a/roles/web-svc-files/templates/nginx.conf.j2 b/roles/web-svc-files/templates/nginx.conf.j2 index 5b2bc472..637db4f2 100644 --- a/roles/web-svc-files/templates/nginx.conf.j2 +++ b/roles/web-svc-files/templates/nginx.conf.j2 @@ -4,7 +4,7 @@ server {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %} charset utf-8; diff --git a/roles/web-svc-html/templates/nginx.conf.j2 b/roles/web-svc-html/templates/nginx.conf.j2 index b81df42a..41ad3b0c 100644 --- a/roles/web-svc-html/templates/nginx.conf.j2 +++ b/roles/web-svc-html/templates/nginx.conf.j2 @@ -4,7 +4,7 @@ server {% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} - {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%} + {% include 'roles/srv-web-injector-compose/templates/global.includes.conf.j2'%} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %} charset utf-8;