CCCHH/ansible-infra
CCCHH/ansible-infra
3
2
Fork 2
Code Issues 6 Pull requests 5 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 +25 -1
dario commented 2025-02-17 20:50:42 +01:00
Owner
Copy link
No description provided.
dokuwiki: add ability to checkout custom theme repo
Some checks failed
/ Ansible Lint (push) Failing after 1m50s
Details
/ Ansible Lint (pull_request) Failing after 1m41s
Details
7ec61f45b3
june requested changes 2025-02-17 21:02:42 +01:00
Dismissed
june left a comment
Owner
Copy link

Aside from this one thing, looks good!

Aside from this one thing, looks good!
roles/dokuwiki/tasks/main.yml
@ -45,0 +53,4 @@
single_branch: true
track_submodules: true
accept_hostkey: true
accept_newhostkey: true
june commented 2025-02-17 21:02:22 +01:00
Owner
Copy link

Let's not do that, but encourage just using https://-clone URLs instead?

Let's not do that, but encourage just using `https://`-clone URLs instead?
dario commented 2025-02-17 21:06:28 +01:00
Author
Owner
Copy link

yeah the hostkey stuff makes sense.
but single branch makes sense as a shallow copy of the repo is sufficient to apply the theme, and if a theme uses submodules, these need to be pulled in as well

yeah the hostkey stuff makes sense. but single branch makes sense as a shallow copy of the repo is sufficient to apply the theme, and if a theme uses submodules, these need to be pulled in as well
june commented 2025-02-17 21:07:16 +01:00
Owner
Copy link

Oh yeah ofc, I'm just talking about:

    accept_hostkey: true
    accept_newhostkey: true

Forgejo doesn't allow highlighting specific ranges, so it just picked four lines it seems. :/

Oh yeah ofc, I'm just talking about: ``` accept_hostkey: true accept_newhostkey: true ``` Forgejo doesn't allow highlighting specific ranges, so it just picked four lines it seems. :/
june marked this conversation as resolved
dokuwiki: don't ignore hostkeys
Some checks failed
/ Ansible Lint (push) Failing after 2m53s
Details
/ Ansible Lint (pull_request) Failing after 1m38s
Details
0998111455
june requested changes 2025-02-17 21:09:29 +01:00
Dismissed
roles/dokuwiki/defaults/main.yml Outdated
@ -4,2 +4,4 @@
dokuwiki__php_user: "www-data"
dokuwiki__nginx_user: "nginx"
dokuwiki__custom_theme_git_url: ""
dokuwiki__custom_theme_name: ""
june commented 2025-02-17 21:09:26 +01:00
Owner
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).
june marked this conversation as resolved
june requested review from jtbx 2025-02-17 21:14:55 +01:00
dokuwiki: document custom theme options in README
Some checks failed
/ Ansible Lint (push) Failing after 1m39s
Details
/ Ansible Lint (pull_request) Failing after 1m36s
Details
e943a541e5
june requested changes 2025-02-17 21:19:27 +01:00
Dismissed
roles/dokuwiki/tasks/main.yml
@ -45,0 +45,4 @@
- name: checkout custom theme git repo
become: true
ansible.builtin.git:
june commented 2025-02-17 21:19:23 +01:00
Owner
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`
june marked this conversation as resolved
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
b5ddebcada
june approved these changes 2025-02-17 21:41:07 +01:00
june left a comment
Owner
Copy link

LGTM! Thanks!

LGTM! Thanks!
dokuwiki: add git to dependencies for custom theme
All checks were successful
/ Ansible Lint (push) Successful in 1m46s
Details
/ Ansible Lint (pull_request) Successful in 1m38s
Details
d9b150eaf0
dokuwiki: add warning about custom theme directory
All checks were successful
/ Ansible Lint (push) Successful in 1m45s
Details
/ Ansible Lint (pull_request) Successful in 1m40s
Details
4788d4d819
june commented 2025-02-17 22:25:14 +01:00
Owner
Copy link

Merged via CCCHH/ansible-infra@7271426502

Merged via https://git.hamburg.ccc.de/CCCHH/ansible-infra/commit/7271426502bee5d43d4169b6c9b939d1bfe3ae4b
june closed this pull request 2025-02-17 22:25:14 +01:00
dario commented 2025-02-17 22:25:27 +01:00
Author
Owner
Copy link

merged by squash

merged by squash
jtbx commented 2025-02-18 19:53:58 +01:00
Owner
Copy link

@dario wrote in #21 (comment):

merged by squash

You know, that Forgejo has a button for that!?

@dario wrote in https://git.hamburg.ccc.de/CCCHH/ansible-infra/pulls/21#issuecomment-1646: > merged by squash You know, that Forgejo has a button for that!?
dario commented 2025-02-18 20:46:50 +01:00
Author
Owner
Copy link

@jtbx wrote in #21 (comment):

@dario wrote in #21 (comment):

merged by squash

You know, that Forgejo has a button for that!?

yes, but the merge commit isnt verified if done via the webinterface

@jtbx wrote in https://git.hamburg.ccc.de/CCCHH/ansible-infra/pulls/21#issuecomment-1666: > @dario wrote in #21 (comment): > > > merged by squash > > You know, that Forgejo has a button for that!? yes, but the merge commit isnt verified if done via the webinterface
All checks were successful
/ Ansible Lint (push) Successful in 1m45s
Details
/ Ansible Lint (pull_request) Successful in 1m40s
Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
jtbx
june
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
renovate

Created automatically by Renovate.

  
waiting on upstream

Waiting on upstream until this can be merged.

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
renovate
waiting on upstream
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
CCCHH/ansible-infra!21
No description provided.