kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-09-17 07:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Harmonized saving path

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-09-16 19:12:08 +02:00
parent 83936edf73
commit 9ce73b9c71
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/web-app-xwiki/templates/docker-compose.yml.j2
View File

@@ -11,9 +11,9 @@
volumes: volumes:
- "{{ XWIKI_HOST_CONF_PATH }}:/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.cfg" - "{{ 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_PROPERTIES_PATH }}:/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.properties"
- "{{ XWIKI_HOST_CONF_PATH }}:/usr/local/xwiki/xwiki.cfg" - "{{ XWIKI_HOST_CONF_PATH }}:{{ [XWIKI_DOCK_DATA_DIR, 'xwiki.cfg'] | path_join }}"
- "{{ XWIKI_HOST_PROPERTIES_PATH }}:/usr/local/xwiki/xwiki.properties" - "{{ XWIKI_HOST_PROPERTIES_PATH }}:{{ [XWIKI_DOCK_DATA_DIR, 'xwiki.properties'] | path_join }}"
- 'data:/usr/local/xwiki' - 'data:{{ XWIKI_DOCK_DATA_DIR }}'
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
{% include 'roles/docker-container/templates/base.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/depends_on/dmbs_excl.yml.j2' %}

2
roles/web-app-xwiki/templates/xwiki.properties.j2
View File

@@ -30,7 +30,7 @@ distribution.defaultUI=org.xwiki.platform:xwiki-platform-distribution-flavor-mai
{% endif %} {% endif %}
# Persist data in the Docker volume # 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. # Make sure Extension Manager can fetch artifacts.
# IMPORTANT: # IMPORTANT:

3
roles/web-app-xwiki/vars/main.yml
View File

@@ -15,6 +15,7 @@ XWIKI_HOSTNAME: "{{ container_hostname }}"
## Paths ## Paths
XWIKI_HOST_CONF_PATH: "{{ [docker_compose.directories.config, 'xwiki.cfg'] | path_join }}" 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_HOST_PROPERTIES_PATH: "{{ [docker_compose.directories.config, 'xwiki.properties'] | path_join }}"
XWIKI_DOCK_DATA_DIR: "/usr/local/xwiki"
## Docker ## Docker
XWIKI_IMAGE_CUSTOM: "xwiki_custom" XWIKI_IMAGE_CUSTOM: "xwiki_custom"
@@ -39,8 +40,8 @@ XWIKI_SUPERADMIN_USERNAME: "superadmin"
# REST endpoint (local inside container) # REST endpoint (local inside container)
XWIKI_REST_BASE: "{{ ['http://127.0.0.1:'~ XWIKI_HOST_PORT, '/rest/'] | url_join }}" 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_XWIKI: "{{ [XWIKI_REST_BASE, 'wikis/xwiki'] | url_join }}"
XWIKI_REST_EXTENSION_INSTALL: "{{ [XWIKI_REST_BASE, 'jobs'] | url_join }}"
# Extension IDs + Versions (pin versions explicitly) # Extension IDs + Versions (pin versions explicitly)
XWIKI_EXT_LDAP_ID: "org.xwiki.contrib.ldap:ldap-authenticator" XWIKI_EXT_LDAP_ID: "org.xwiki.contrib.ldap:ldap-authenticator"