kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-07-18 06:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solved dependency bug which appeared due to autogeneration of meta/main.yml files

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-09 18:01:58 +02:00
parent 0b80ba6f54
commit 944707ec41
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
20 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/categories.yml
View File

@ -38,7 +38,7 @@ categories:
icon: "fas fa-project-diagram" icon: "fas fa-project-diagram"
injector: injector:
core: core:
title: "srv-web-injector-core" title: "srv-web-injector-compose"
description: "Inject core HTML modifiers" description: "Inject core HTML modifiers"
icon: "fas fa-code" icon: "fas fa-code"
css: css:

2
roles/srv-web-composer/README.md
View File

@ -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: 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`. Injects global HTML snippets (CSS, Matomo tracking, iFrame notifier, custom JavaScript) into responses using Nginx `sub_filter`.
2. **`srv-web-tls-core`** 2. **`srv-web-tls-core`**
Handles issuing, renewing, and managing TLS certificates via ACME/Certbot. Handles issuing, renewing, and managing TLS certificates via ACME/Certbot.

2
roles/srv-web-composer/meta/main.yml
View File

@ -29,5 +29,5 @@ galaxy_info:
issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues"
documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/srv-web-composer" documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/srv-web-composer"
dependencies: dependencies:
- srv-web-injector-core - srv-web-injector-compose
- srv-web-tls-core - srv-web-tls-core

4
roles/srv-web-composer/tasks/main.yml
View File

@ -1,6 +1,6 @@
- name: "include role srv-web-injector-core for {{domain}}" - name: "include role srv-web-injector-compose for {{domain}}"
include_role: include_role:
name: srv-web-injector-core name: srv-web-injector-compose
- name: "include role srv-web-tls-core for {{domain}}" - name: "include role srv-web-tls-core for {{domain}}"
include_role: include_role:

0
roles/srv-web-injector-core/README.md → roles/srv-web-injector-compose/README.md
View File

9
roles/srv-web-injector-core/meta/main.yml → roles/srv-web-injector-compose/meta/main.yml
View File

@ -15,14 +15,13 @@ galaxy_info:
- theming - theming
repository: "https://github.com/kevinveenbirkenbach/cymais" repository: "https://github.com/kevinveenbirkenbach/cymais"
issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" 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" min_ansible_version: "2.9"
platforms: platforms:
- name: Any - name: Any
versions: versions:
- all - all
dependencies: dependencies:
- srv-web-injector-matomo # The injections are called in the script. Keep the logic there.
- srv-web-injector-css - srv-web-core
- srv-web-injector-iframe
- srv-web-injector-javascript

0
roles/srv-web-injector-core/tasks/main.yml → roles/srv-web-injector-compose/tasks/main.yml
View File

0
roles/srv-web-injector-core/templates/global.includes.conf.j2 → roles/srv-web-injector-compose/templates/global.includes.conf.j2
View File

2
roles/srv-web-injector-css/tasks/main.yml
View File

@ -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 - name: Generate color palette with colorscheme-generator
set_fact: set_fact:

2
roles/srv-web-injector-matomo/tasks/main.yml
View File

@ -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 }}" - name: "Relevant variables for role: {{ role_path | basename }}"
debug: debug:

2
roles/srv-web-proxy-core/templates/vhost/basic.conf.j2
View File

@ -6,7 +6,7 @@ server
{% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%} {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
{% endif %} {% 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 %} {% if nginx_docker_reverse_proxy_extra_configuration is defined %}
{# Additional Domain Specific Configuration #} {# Additional Domain Specific Configuration #}

2
roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2
View File

@ -7,7 +7,7 @@ server {
server_name {{ domain }}; server_name {{ domain }};
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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') }}; client_max_body_size {{ client_max_body_size | default('100m') }};
keepalive_timeout 70; keepalive_timeout 70;

2
roles/srv-web-proxy-domain/README.md
View File

@ -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: 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. 2. **`srv-web-tls-core`** – obtains Let’s Encrypt certificates.
3. **Domain template deployment** – copies a Jinja2 vHost from *srv-web-proxy-core*. 3. **Domain template deployment** – copies a Jinja2 vHost from *srv-web-proxy-core*.
4. **`web-app-oauth2-proxy`** *(optional)* – protects the site with OAuth2. 4. **`web-app-oauth2-proxy`** *(optional)* – protects the site with OAuth2.

2
roles/web-app-collabora/templates/nginx.conf.j2
View File

@ -3,7 +3,7 @@ server {
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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' %} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}

2
roles/web-app-matrix/templates/nginx.conf.j2
View File

@ -11,6 +11,6 @@ server {
listen 8448 ssl default_server; listen 8448 ssl default_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' %} {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
} }

2
roles/web-app-nextcloud/templates/nginx/host.conf.j2
View File

@ -6,7 +6,7 @@ server
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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 # Remove X-Powered-By, which is an information leak
fastcgi_hide_header X-Powered-By; fastcgi_hide_header X-Powered-By;

2
roles/web-app-peertube/templates/peertube.conf.j2
View File

@ -3,7 +3,7 @@ server {
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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' %} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}

2
roles/web-app-syncope/templates/proxy.conf
View File

@ -6,7 +6,7 @@ server
{% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%} {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
{% endif %} {% 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 %} {% if nginx_docker_reverse_proxy_extra_configuration is defined %}
{# Additional Domain Specific Configuration #} {# Additional Domain Specific Configuration #}

2
roles/web-svc-files/templates/nginx.conf.j2
View File

@ -4,7 +4,7 @@ server
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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' %} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
charset utf-8; charset utf-8;

2
roles/web-svc-html/templates/nginx.conf.j2
View File

@ -4,7 +4,7 @@ server
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %} {% 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' %} {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
charset utf-8; charset utf-8;