mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-11 03:37:08 +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
54 lines
1.9 KiB
YAML
54 lines
1.9 KiB
YAML
- name: "include docker-compose role"
|
|
include_role:
|
|
name: docker-compose
|
|
vars:
|
|
docker_compose_flush_handlers: false
|
|
|
|
- name: "Include front proxy for {{ BLUESKY_API_DOMAIN }}:{{ BLUESKY_API_PORT }}"
|
|
include_role:
|
|
name: sys-stk-front-proxy
|
|
vars:
|
|
domain: "{{ BLUESKY_API_DOMAIN }}"
|
|
http_port: "{{ BLUESKY_API_PORT }}"
|
|
|
|
- name: "Include front proxy for {{ BLUESKY_WEB_DOMAIN }}:{{ BLUESKY_WEB_PORT }}"
|
|
include_role:
|
|
name: sys-stk-front-proxy
|
|
vars:
|
|
domain: "{{ BLUESKY_WEB_DOMAIN }}"
|
|
http_port: "{{ BLUESKY_WEB_PORT }}"
|
|
webserver_extra_configuration: "{{ BLUESKY_FRONT_PROXY_CONTENT }}"
|
|
when: BLUESKY_WEB_ENABLED | bool
|
|
|
|
- name: "Include front proxy for {{ BLUESKY_VIEW_DOMAIN_FINAL }}:{{ BLUESKY_VIEW_PORT }}"
|
|
include_role:
|
|
name: sys-stk-front-proxy
|
|
vars:
|
|
domain: "{{ BLUESKY_VIEW_DOMAIN_FINAL }}"
|
|
http_port: "{{ BLUESKY_VIEW_PORT }}"
|
|
when: BLUESKY_VIEW_ENABLED | bool
|
|
|
|
- name: "Execute PDS routines"
|
|
ansible.builtin.include_tasks: "01_pds.yml"
|
|
|
|
- name: "Execute Social App routines"
|
|
ansible.builtin.include_tasks: "02_social_app.yml"
|
|
when: BLUESKY_WEB_ENABLED | bool
|
|
|
|
- name: "DNS for Bluesky"
|
|
include_tasks: "03_dns.yml"
|
|
when: DNS_PROVIDER | lower == 'cloudflare'
|
|
|
|
- name: Resolve redirect_domain_mappings now (before include_role)
|
|
set_fact:
|
|
BLUESKY_REDIRECT_DOMAIN_MAPPINGS: >-
|
|
{{
|
|
( (BLUESKY_WEB_ENABLED | bool) | ternary([], [ {'source': BLUESKY_WEB_DOMAIN, 'target': BLUESKY_API_DOMAIN } ]) )
|
|
+ ( (BLUESKY_VIEW_ENABLED | bool) | ternary([], [ {'source': BLUESKY_VIEW_DOMAIN_LOCAL, 'target': BLUESKY_API_DOMAIN } ]) )
|
|
}}
|
|
|
|
- name: "Redirect deactivated BlueSky Services to {{ BLUESKY_API_DOMAIN }}"
|
|
include_tasks: "utils/load_app.yml"
|
|
vars:
|
|
load_app_id: web-opt-rdr-domains
|
|
redirect_domain_mappings: "{{ BLUESKY_REDIRECT_DOMAIN_MAPPINGS }}" |