Adapted code for virgin setup

This commit is contained in:
Kevin Veen-Birkenbach 2025-02-15 16:02:27 +01:00
parent 99b262c0a6
commit 0b98bc1541
4 changed files with 8 additions and 3 deletions

View File

@ -147,7 +147,7 @@ defaults_applications:
version: "latest" version: "latest"
redirect_url: "https://{{domains.keycloak}}/auth/realms/{{primary_domain}}/protocol/openid-connect/auth" # The redirect URL for the OAuth2 flow. It should match the redirect URL configured in Keycloak. redirect_url: "https://{{domains.keycloak}}/auth/realms/{{primary_domain}}/protocol/openid-connect/auth" # The redirect URL for the OAuth2 flow. It should match the redirect URL configured in Keycloak.
allowed_roles: admin # Restrict it default to admin role. Use the vars/main.yml to open the specific role for other groups allowed_roles: admin # Restrict it default to admin role. Use the vars/main.yml to open the specific role for other groups
cookie_secret: "{{applications.oauth2_proxy.cookie_secret}}" # Default use wildcard for primary domain, subdomain client specific configuration in vars files in the roles is possible openssl rand -hex 16 cookie_secret: "{{ applications.oauth2_proxy.cookie_secret if applications.oauth2_proxy is defined else '' }}" # Default use wildcard for primary domain, subdomain client specific configuration in vars files in the roles is possible openssl rand -hex 16
## Open Project ## Open Project
openproject: openproject:

View File

@ -15,7 +15,7 @@
{{ {{
(defaults_redirect_domain_mappings | items2dict(key_name='source', value_name='target')) (defaults_redirect_domain_mappings | items2dict(key_name='source', value_name='target'))
| combine( | combine(
(redirect_domain_mappings | items2dict(key_name='source', value_name='target')), (redirect_domain_mappings | default([]) | items2dict(key_name='source', value_name='target')),
recursive=True recursive=True
) )
}} }}

View File

@ -3,4 +3,4 @@
become: true become: true
roles: roles:
- role: system-storage-optimizer - role: system-storage-optimizer
when: "(path_mass_storage is defined or path_rapid_storage is defined) and enable_system_storage_optimizer | bool" when: "(path_mass_storage is defined or path_rapid_storage is defined) and enable_system_storage_optimizer | bool and (docker_enabled is defined and docker_enabled | bool) "

View File

@ -16,6 +16,11 @@
group: administrator group: administrator
when: run_once_docker is not defined when: run_once_docker is not defined
- name: Set docker_enabled to true, to activate system-storage-optimizer
set_fact:
docker_enabled: true
when: run_once_docker is not defined
- name: flush docker service - name: flush docker service
meta: flush_handlers meta: flush_handlers
when: run_once_docker is not defined when: run_once_docker is not defined