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
40 lines
1.9 KiB
YAML
40 lines
1.9 KiB
YAML
# General
|
|
application_id: "web-app-desktop"
|
|
http_port: "{{ ports.localhost.http[application_id] }}"
|
|
|
|
## Webserver
|
|
webserver_extra_configuration: "{{ lookup('template', 'nginx/sso.html.conf.j2') }}"
|
|
|
|
# Desktop
|
|
|
|
## Simpleicons
|
|
DESKTOP_SIMPLEICONS_ENABLED: "{{ applications | get_app_conf(application_id, 'features.simpleicons') }}"
|
|
|
|
## Javascript
|
|
DESKTOP_JS_CDN_URL: "{{ domains | get_url('web-svc-cdn', WEB_PROTOCOL) }}"
|
|
DESKTOP_JS_FILES: ['iframe.js','oidc.js']
|
|
DESKTOP_JS_BASE_PATH: "{{ application_id | get_entity_name }}/js"
|
|
DESKTOP_JS_SERVER_DIR: "{{ [ NGINX.DIRECTORIES.DATA.CDN, DESKTOP_JS_BASE_PATH ] | path_join }}"
|
|
DESKTOP_JS_BASE_URL: "{{ (DESKTOP_JS_CDN_URL | trim('/')) ~ '/' ~ (DESKTOP_JS_BASE_PATH | trim('/')) }}"
|
|
|
|
## Webserver
|
|
DESKTOP_LOCATION_SILENT_CHECK: "/silent-check-sso.html"
|
|
|
|
## Configuration
|
|
DESKTOP_CONFIG_YML_SRC_FILE: "config.yaml.j2"
|
|
DESKTOP_CONFIG_INV_PATH: "{{ [ inventory_dir, 'files', inventory_hostname ,'docker',application_id,DESKTOP_CONFIG_YML_SRC_FILE] | path_join }}"
|
|
DESKTOP_CONFIG_YML_DEST: "{{ [ docker_repository_path, 'app/config.yaml'] | path_join }}"
|
|
|
|
## OIDC
|
|
DESKTOP_KEYCLOAK_LOGIN_URL: >-
|
|
{{ OIDC.CLIENT.AUTHORIZE_URL
|
|
~ '?client_id=' ~ OIDC.CLIENT.ID
|
|
~ '&response_type=code'
|
|
~ '&scope=openid%20profile%20email'
|
|
~ '&redirect_uri=' ~ (domains | get_url(application_id, WEB_PROTOCOL)) | urlencode }}
|
|
DESKTOP_KEYCLOAK_IFRAME_ENABLED: "{{ applications | get_app_conf( 'web-app-keycloak', 'features.desktop') }}"
|
|
DESKTOP_OIDC_ENABLED: "{{ applications | get_app_conf( application_id, 'features.oidc') }}"
|
|
|
|
## Docker
|
|
DESKTOP_CONTAINER: "{{ applications | get_app_conf( application_id, 'docker.services.desktop.name') }}"
|
|
DESKTOP_IMAGE: "{{ applications | get_app_conf( application_id, 'docker.services.desktop.image') }}" |