From 9ce73b9c71075e36af81e69f5d989616746758df Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 16 Sep 2025 19:12:08 +0200 Subject: [PATCH] Harmonized saving path --- roles/web-app-xwiki/templates/docker-compose.yml.j2 | 6 +++--- roles/web-app-xwiki/templates/xwiki.properties.j2 | 2 +- roles/web-app-xwiki/vars/main.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/web-app-xwiki/templates/docker-compose.yml.j2 b/roles/web-app-xwiki/templates/docker-compose.yml.j2 index f4168743..b43d2422 100644 --- a/roles/web-app-xwiki/templates/docker-compose.yml.j2 +++ b/roles/web-app-xwiki/templates/docker-compose.yml.j2 @@ -11,9 +11,9 @@ volumes: - "{{ XWIKI_HOST_CONF_PATH }}:/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.cfg" - "{{ XWIKI_HOST_PROPERTIES_PATH }}:/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.properties" - - "{{ XWIKI_HOST_CONF_PATH }}:/usr/local/xwiki/xwiki.cfg" - - "{{ XWIKI_HOST_PROPERTIES_PATH }}:/usr/local/xwiki/xwiki.properties" - - 'data:/usr/local/xwiki' + - "{{ XWIKI_HOST_CONF_PATH }}:{{ [XWIKI_DOCK_DATA_DIR, 'xwiki.cfg'] | path_join }}" + - "{{ XWIKI_HOST_PROPERTIES_PATH }}:{{ [XWIKI_DOCK_DATA_DIR, 'xwiki.properties'] | path_join }}" + - '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' %} diff --git a/roles/web-app-xwiki/templates/xwiki.properties.j2 b/roles/web-app-xwiki/templates/xwiki.properties.j2 index 3b84cce5..a5c5331b 100644 --- a/roles/web-app-xwiki/templates/xwiki.properties.j2 +++ b/roles/web-app-xwiki/templates/xwiki.properties.j2 @@ -30,7 +30,7 @@ distribution.defaultUI=org.xwiki.platform:xwiki-platform-distribution-flavor-mai {% endif %} # Persist data in the Docker volume -environment.permanentDirectory=/usr/local/xwiki/data +environment.permanentDirectory={{ XWIKI_DOCK_DATA_DIR }} # Make sure Extension Manager can fetch artifacts. # IMPORTANT: diff --git a/roles/web-app-xwiki/vars/main.yml b/roles/web-app-xwiki/vars/main.yml index 918a8bf7..8b9d3ab2 100644 --- a/roles/web-app-xwiki/vars/main.yml +++ b/roles/web-app-xwiki/vars/main.yml @@ -15,6 +15,7 @@ XWIKI_HOSTNAME: "{{ container_hostname }}" ## Paths XWIKI_HOST_CONF_PATH: "{{ [docker_compose.directories.config, 'xwiki.cfg'] | path_join }}" XWIKI_HOST_PROPERTIES_PATH: "{{ [docker_compose.directories.config, 'xwiki.properties'] | path_join }}" +XWIKI_DOCK_DATA_DIR: "/usr/local/xwiki" ## Docker XWIKI_IMAGE_CUSTOM: "xwiki_custom" @@ -39,8 +40,8 @@ XWIKI_SUPERADMIN_USERNAME: "superadmin" # REST endpoint (local inside container) XWIKI_REST_BASE: "{{ ['http://127.0.0.1:'~ XWIKI_HOST_PORT, '/rest/'] | url_join }}" -XWIKI_REST_EXTENSION_INSTALL: "{{ [XWIKI_REST_BASE, 'jobs'] | url_join }}" XWIKI_REST_XWIKI: "{{ [XWIKI_REST_BASE, 'wikis/xwiki'] | url_join }}" +XWIKI_REST_EXTENSION_INSTALL: "{{ [XWIKI_REST_BASE, 'jobs'] | url_join }}" # Extension IDs + Versions (pin versions explicitly) XWIKI_EXT_LDAP_ID: "org.xwiki.contrib.ldap:ldap-authenticator"