CCCHH/ansible-infra
CCCHH/ansible-infra
3
2
Fork 0
Code Issues2 Pull requests 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
Conversation 4 Commits 6 Files changed 3 +25 -1
dario commented 2025-02-17 20:50:42 +01:00
Owner
No description provided.
dario added 1 commit 2025-02-17 20:50:43 +01:00
june requested changes 2025-02-17 21:02:42 +01:00
Dismissed
june left a comment
Owner

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

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

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

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
dario added 1 commit 2025-02-17 21:09:14 +01:00
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

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
requested review from jtbx 2025-02-17 21:14:55 +01:00
dario added 1 commit 2025-02-17 21:16:17 +01:00
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

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
dario added 1 commit 2025-02-17 21:34:26 +01:00
june approved these changes 2025-02-17 21:41:07 +01:00
june left a comment
Owner

LGTM! Thanks!

LGTM! Thanks!
dario added 1 commit 2025-02-17 21:52:19 +01:00
dario added 1 commit 2025-02-17 22:14:29 +01:00
june commented 2025-02-17 22:25:14 +01:00
Owner

Merged via 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

merged by squash

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

@dario wrote in :

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

@jtbx wrote in :

@dario wrote in (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.
No reviewers
jtbx
june
No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
No milestone
No project
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.
Delete branch "eh22-wiki-design"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?