CCCHH/ansible-infra
CCCHH/ansible-infra
4
2
Fork 1
Code Issues 4 Pull requests 2 Wiki Activity Actions

dokuwiki: add ability to checkout custom theme repo #21

Closed
dario wants to merge 6 commits from eh22-wiki-design into main
pull from: eh22-wiki-design
merge into: CCCHH:main
Conversation 8 Commits 6 Files changed 3 +3
3 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b5ddebcada - Show all commits

dokouwiki: add option which theme branch to check out
All checks were successful
/ Ansible Lint (push) Successful in 1m44s
Details
/ Ansible Lint (pull_request) Successful in 1m40s
Details

Prev Next
Dario 2025-02-17 21:34:01 +01:00
commit b5ddebcada
Signed by: dario
SSH key fingerprint: SHA256:zP7OE8nhYwOWaDhOawrP6NmUVcZWi0wyPKQa6052GpM

1
roles/dokuwiki/README.md
View file

@ -23,6 +23,7 @@ None.
- `dokuwiki__php_user`: User of your php-fpm process, default `www-data` - `dokuwiki__php_user`: User of your php-fpm process, default `www-data`
- `dokuwiki__nginx_user`: User of your nginx process, default `nginx` - `dokuwiki__nginx_user`: User of your nginx process, default `nginx`
- `dokuwiki__custom_theme_git_url`: Clone URL of custom theme (HTTPS only) - `dokuwiki__custom_theme_git_url`: Clone URL of custom theme (HTTPS only)
- `dokuwiki__custom_theme_version`: Version (git branch, tag, ...) to checkout, default main
- `dokuwiki__custom_theme_name`: Name of the directory into which the custom theme is cloned - `dokuwiki__custom_theme_name`: Name of the directory into which the custom theme is cloned
## nginx Configuration ## nginx Configuration

1
roles/dokuwiki/defaults/main.yml
View file

@ -4,4 +4,5 @@ dokuwiki__php_version: "{{ dokuwiki__php_versions[ansible_distribution + '-' + a
dokuwiki__php_user: "www-data" dokuwiki__php_user: "www-data"
dokuwiki__nginx_user: "nginx" dokuwiki__nginx_user: "nginx"
dokuwiki__custom_theme_git_url: "" dokuwiki__custom_theme_git_url: ""
dokuwiki__custom_theme_version: "main"
june marked this conversation as resolved Outdated
june commented 2025-02-17 21:09:26 +01:00
Outdated
Copy link

Oh also please document both these options in the README.

Oh also please document both these options in the [README](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/roles/dokuwiki/README.md?display=source#L19).
dokuwiki__custom_theme_name: "" dokuwiki__custom_theme_name: ""

1
roles/dokuwiki/tasks/main.yml
View file

@ -48,6 +48,7 @@
ansible.builtin.git: ansible.builtin.git:
june marked this conversation as resolved
june commented 2025-02-17 21:19:23 +01:00
Copy link

ansible-lint is failing as this module-use isn't idempotent. Let's introduce the following option and attribute for the module, to make it theoretically possible to be idempotent:

dokuwiki__custom_theme_version: "main"

And then set for ansible.builtin.git:

    version: "{{ dokuwiki__custom_theme_version }}"

Documentation for dokuwiki__custom_theme_version would be: version (git branch, tag, ...) to checkout, default main

`ansible-lint` is failing as this module-use isn't idempotent. Let's introduce the following option and attribute for the module, to make it theoretically possible to be idempotent: ```yaml dokuwiki__custom_theme_version: "main" ``` And then set for `ansible.builtin.git`: ```yaml version: "{{ dokuwiki__custom_theme_version }}" ``` Documentation for `dokuwiki__custom_theme_version` would be: version (git branch, tag, ...) to checkout, default `main`
repo: "{{ dokuwiki__custom_theme_git_url }}" repo: "{{ dokuwiki__custom_theme_git_url }}"
dest: "{{ dokuwiki__installpath }}/lib/tpl/{{ dokuwiki__custom_theme_name }}" dest: "{{ dokuwiki__installpath }}/lib/tpl/{{ dokuwiki__custom_theme_name }}"
version: "{{ dokuwiki__custom_theme_version }}"
force: true force: true
depth: 1 depth: 1
single_branch: true single_branch: true