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

Refactored administrator page variables

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-09-16 19:57:07 +02:00
parent 9ce73b9c71
commit 0566c426c9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/web-app-xwiki/tasks/03_administrator.yml
View File

@@ -1,7 +1,7 @@
# 1) Create page XWiki.<userid> (PUT is idempotent) # 1) Create page XWiki.<userid> (PUT is idempotent)
- name: "XWIKI | Ensure user page exists: XWiki.{{ XWIKI_ADMIN_USER }}" - name: "XWIKI | Ensure user page exists: XWiki.{{ XWIKI_ADMIN_USER }}"
uri: uri:
url: "{{ XWIKI_REST_BASE }}wikis/xwiki/spaces/XWiki/pages/{{ XWIKI_ADMIN_USER | urlencode }}" url: "{{ [XWIKI_REST_XWIKI_PAGES, XWIKI_ADMIN_USER | urlencode] | url_join }}"
method: PUT method: PUT
user: "{{ XWIKI_SUPERADMIN_USERNAME }}" user: "{{ XWIKI_SUPERADMIN_USERNAME }}"
password: "{{ XWIKI_SUPERADMIN_PASSWORD }}" password: "{{ XWIKI_SUPERADMIN_PASSWORD }}"
@@ -19,7 +19,7 @@
# 2) Add XWiki.XWikiUsers object (only if it does not already exist) # 2) Add XWiki.XWikiUsers object (only if it does not already exist)
- name: "XWIKI | Check if XWikiUsers object exists" - name: "XWIKI | Check if XWikiUsers object exists"
uri: uri:
url: "{{ XWIKI_REST_BASE }}wikis/xwiki/spaces/XWiki/pages/{{ XWIKI_ADMIN_USER | urlencode }}/objects?classname=XWiki.XWikiUsers" url: "{{ [XWIKI_REST_XWIKI_PAGES, XWIKI_ADMIN_USER | urlencode, 'objects'] | url_join }}?classname=XWiki.XWikiUsers"
method: GET method: GET
user: "{{ XWIKI_SUPERADMIN_USERNAME }}" user: "{{ XWIKI_SUPERADMIN_USERNAME }}"
password: "{{ XWIKI_SUPERADMIN_PASSWORD }}" password: "{{ XWIKI_SUPERADMIN_PASSWORD }}"
@@ -29,7 +29,7 @@
- name: "XWIKI | Add XWiki.XWikiUsers object" - name: "XWIKI | Add XWiki.XWikiUsers object"
uri: uri:
url: "{{ XWIKI_REST_BASE }}wikis/xwiki/spaces/XWiki/pages/{{ XWIKI_ADMIN_USER | urlencode }}/objects" url: "{{ [XWIKI_REST_XWIKI_PAGES, XWIKI_ADMIN_USER | urlencode, 'objects'] | url_join }}"
method: POST method: POST
user: "{{ XWIKI_SUPERADMIN_USERNAME }}" user: "{{ XWIKI_SUPERADMIN_USERNAME }}"
password: "{{ XWIKI_SUPERADMIN_PASSWORD }}" password: "{{ XWIKI_SUPERADMIN_PASSWORD }}"
@@ -54,7 +54,7 @@
# 3) (Optional) Assign admin rights by adding the user to XWikiAdminGroup # 3) (Optional) Assign admin rights by adding the user to XWikiAdminGroup
- name: "XWIKI | Ensure user is in XWikiAdminGroup" - name: "XWIKI | Ensure user is in XWikiAdminGroup"
uri: uri:
url: "{{ XWIKI_REST_BASE }}wikis/xwiki/spaces/XWiki/pages/XWikiAdminGroup/objects" url: "{{ [XWIKI_REST_XWIKI_PAGES, 'XWikiAdminGroup/objects'] | url_join }}"
method: POST method: POST
user: "{{ XWIKI_SUPERADMIN_USERNAME }}" user: "{{ XWIKI_SUPERADMIN_USERNAME }}"
password: "{{ XWIKI_SUPERADMIN_PASSWORD }}" password: "{{ XWIKI_SUPERADMIN_PASSWORD }}"

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

@@ -41,6 +41,7 @@ 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_XWIKI: "{{ [XWIKI_REST_BASE, 'wikis/xwiki'] | url_join }}" XWIKI_REST_XWIKI: "{{ [XWIKI_REST_BASE, 'wikis/xwiki'] | url_join }}"
XWIKI_REST_XWIKI_PAGES: "{{ [XWIKI_REST_BASE, 'wikis/xwiki/spaces/XWiki/pages'] | url_join }}"
XWIKI_REST_EXTENSION_INSTALL: "{{ [XWIKI_REST_BASE, 'jobs'] | url_join }}" XWIKI_REST_EXTENSION_INSTALL: "{{ [XWIKI_REST_BASE, 'jobs'] | url_join }}"
# Extension IDs + Versions (pin versions explicitly) # Extension IDs + Versions (pin versions explicitly)