mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-11-05 20:58:21 +00:00
Kevin Veen-Birkenbach
2f46b99e4e
- Added 05_set_authservice.yml to set XWikiPreferences.authenticationService to modern component hints (standard, oidc, ldap). - Added _auth_diag.yml to introspect registered AuthService components and verify the active preference. - Updated docker-compose.yml.j2 to use -Dxwiki.authentication.authservice instead of deprecated authclass syntax. - Temporarily included AuthDiag task in 01_core.yml for runtime verification. Context: https://chatgpt.com/share/69005d88-6bf8-800f-af41-73b0e5dc9c13
42 lines
2.0 KiB
Django/Jinja
42 lines
2.0 KiB
Django/Jinja
{% include 'roles/docker-compose/templates/base.yml.j2' %}
|
|
application:
|
|
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
|
|
image: "{{ XWIKI_IMAGE_CUSTOM }}"
|
|
container_name: "{{ XWIKI_CONTAINER }}"
|
|
hostname: '{{ XWIKI_HOSTNAME}}'
|
|
ports:
|
|
- "127.0.0.1:{{ XWIKI_HOST_PORT }}:{{ container_port }}"
|
|
environment:
|
|
JAVA_OPTS: >-
|
|
{% if xwiki_oidc_enabled_switch | bool %}
|
|
-Dxwiki.authentication.authservice=oidc
|
|
{% elif xwiki_ldap_enabled_switch | bool %}
|
|
-Dxwiki.authentication.authservice=ldap
|
|
-Dxwiki.authentication.ldap=1
|
|
-Dxwiki.authentication.ldap.trylocal={{ (XWIKI_LDAP_TRYLOCAL | bool) | ternary(1, 0) }}
|
|
-Dxwiki.authentication.ldap.group_mapping=XWiki.XWikiAdminGroup={{ XWIKI_LDAP_ADMIN_GROUP_DN }}
|
|
-Dxwiki.authentication.ldap.mode_group_sync=always
|
|
-Dxwiki.authentication.ldap.server={{ XWIKI_LDAP_SERVER }}
|
|
-Dxwiki.authentication.ldap.port={{ XWIKI_LDAP_PORT }}
|
|
-Dxwiki.authentication.ldap.base_DN={{ XWIKI_LDAP_BASE_DN }}
|
|
-Dxwiki.authentication.ldap.bind_DN={{ XWIKI_LDAP_BIND_DN }}
|
|
-Dxwiki.authentication.ldap.bind_pass={{ XWIKI_LDAP_BIND_PASS }}
|
|
-Dxwiki.authentication.ldap.fields_mapping={{ XWIKI_LDAP_FIELDS_MAPPING }}
|
|
-Dxwiki.authentication.ldap.update_user=1
|
|
{% else %}
|
|
-Dxwiki.authentication.authservice=standard
|
|
{% endif %}
|
|
volumes:
|
|
- "{{ XWIKI_HOST_PROPERTIES_PATH }}:/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.properties"
|
|
- 'data:{{ XWIKI_DOCK_DATA_DIR }}'
|
|
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
|
|
{% include 'roles/docker-container/templates/base.yml.j2' %}
|
|
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
|
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
|
|
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
|
data:
|
|
name: {{ XWIKI_DATA_VOLUME }}
|
|
|
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|