mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-08 10:26:35 +00:00
Kevin Veen-Birkenbach
986f959696
Refactor proxy/webserver configuration variables to a consistent webserver_* naming scheme across roles. Replace legacy variables like proxy_extra_configuration, client_max_body_size, vhost_flavour, location_ws and ws_port with webserver_extra_configuration, webserver_client_max_body_size, webserver_vhost_flavour, webserver_websocket_location and webserver_websocket_port. Update NGINX vhost and location templates (html, upload, ws, basic, ws_generic) as well as callers (sys-front-inj-all, sys-stk-front-proxy, various web-app-* and web-svc-* roles) to use the new naming. Tighten docker-compose Git repository handling by making docker_git_repository_pull depend on docker_git_repository_address being defined, a string and non-empty. This avoids accidental Git operations when the repository address is unset or of the wrong type. Refactor the BigBlueButton role structure and fix deployment bugs: introduce 01_core.yml to orchestrate docker/proxy setup, database seeding, websocket map deployment, docker-compose overrides and admin/bootstrap logic in a single once-executed entrypoint. Rename supporting task files (02_docker-compose.yml, 03_administrator.yml, 04_dependencies.yml) and update tasks/main.yml to delegate via include_tasks with run_once_web_app_bigbluebutton. Improve Greenlight admin creation behavior by treating the 'Email has already been taken' error as a non-fatal, unchanged outcome and running user:set_admin_role as a fallback, both for the primary password and the OIDC starred-password path. Also standardize vhost flavour selection for services like Mailu, Discourse, CDN, Collabora, Coturn, OnlyOffice, Simpleicons and web-svc-logout by explicitly passing webserver_vhost_flavour where needed and aligning client_max_body_size and websocket configuration with the new webserver_* variables. Reference: ChatGPT conversation https://chatgpt.com/share/6931c530-bba8-800f-9997-dd61dc1d497b
61 lines
2.2 KiB
Django/Jinja
61 lines
2.2 KiB
Django/Jinja
server
|
|
{
|
|
server_name {{ domain }};
|
|
{% include 'roles/sys-svc-proxy/templates/headers/buffers.conf.j2' %}
|
|
|
|
{% if applications | get_app_conf(application_id, 'features.oauth2', False) %}
|
|
{% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
|
|
{% endif %}
|
|
|
|
{% include 'roles/sys-front-inj-all/templates/server.conf.j2'%}
|
|
|
|
{% if webserver_extra_configuration is defined %}
|
|
{# Additional Domain Specific Configuration #}
|
|
{{ webserver_extra_configuration }}
|
|
{% endif %}
|
|
|
|
{% include 'roles/sys-svc-letsencrypt/templates/ssl_header.j2' %}
|
|
|
|
{% if applications | get_app_conf(application_id, 'features.oauth2', False) %}
|
|
{% set acl = applications | get_app_conf(application_id, 'docker.services.oauth2_proxy.acl', False, {}) %}
|
|
|
|
{% if acl.blacklist is defined %}
|
|
{# 1. Expose everything by default, then protect blacklisted paths #}
|
|
{% set oauth2_proxy_enabled = false %}
|
|
{% set location = "/" %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
|
|
{% for loc in acl.blacklist %}
|
|
{% set oauth2_proxy_enabled = true %}
|
|
{% set location = loc %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
{% endfor %}
|
|
|
|
{% elif acl.whitelist is defined %}
|
|
{# 2. Protect everything by default, then expose whitelisted paths #}
|
|
{% set oauth2_proxy_enabled = true %}
|
|
{% set location = "/" %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
|
|
{% for loc in acl.whitelist %}
|
|
{% set oauth2_proxy_enabled = false %}
|
|
{% set location = loc %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
{% endfor %}
|
|
|
|
{% else %}
|
|
{# 3. OAuth2 enabled but no (or empty) ACL — protect all #}
|
|
{% set oauth2_proxy_enabled = true %}
|
|
{% set location = "/" %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
{% endif %}
|
|
|
|
{% else %}
|
|
{# 4. OAuth2 completely disabled — expose all #}
|
|
{% set oauth2_proxy_enabled = false %}
|
|
{% set location = "/" %}
|
|
{% include 'roles/sys-svc-proxy/templates/location/html.conf.j2' %}
|
|
{% endif %}
|
|
|
|
}
|