CCCHH/ansible-infra
CCCHH/ansible-infra
Watch
3
2
Fork
You've already forked ansible-infra
 1
Code Issues 18 Pull requests 12 Wiki Activity Actions

add dooris role for setup of dooris interaction on the node itself #129

Merged
lilly merged 2 commits from new-dooris-role into main 2026-07-29 15:07:00 +02:00
Conversation 5 Commits 2 Files changed 15 +180 -51
lilly commented 2026-07-19 17:01:35 +02:00
Owner
Copy link
No description provided.
lilly self-assigned this 2026-07-19 17:01:35 +02:00
add dooris role for setup of dooris interaction on the node itself
Some checks failed
/ build (pull_request) Successful in 46s
Details
/ Ansible Lint (push) Failing after 4m47s
Details
/ Ansible Lint (pull_request) Failing after 4m58s
Details
2abbb71788
forgejo-actions commented 2026-07-19 17:02:18 +02:00
Copy link

You can view your changes at https://staging.infra-docs.hamburg.ccc.de/pr129/

You can view your changes at https://staging.infra-docs.hamburg.ccc.de/pr129/
lilly force-pushed new-dooris-role from 2abbb71788
Some checks failed
/ build (pull_request) Successful in 46s
Details
/ Ansible Lint (push) Failing after 4m47s
Details
/ Ansible Lint (pull_request) Failing after 4m58s
Details
to 2be6c1e943
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Failing after 2m47s
Details
/ Ansible Lint (pull_request) Failing after 2m50s
Details
2026-07-19 17:12:16 +02:00 Compare
lilly force-pushed new-dooris-role from 2be6c1e943
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Failing after 2m47s
Details
/ Ansible Lint (pull_request) Failing after 2m50s
Details
to aec9ba7c12
All checks were successful
/ build (pull_request) Successful in 27s
Details
/ Ansible Lint (pull_request) Successful in 2m33s
Details
/ Ansible Lint (push) Successful in 2m35s
Details
2026-07-19 17:32:33 +02:00 Compare
lilly changed title from WIP: add dooris role for setup of dooris interaction on the node itself to add dooris role for setup of dooris interaction on the node itself 2026-07-19 17:42:27 +02:00
lilly requested review from june 2026-07-19 17:42:32 +02:00
june requested changes 2026-07-19 18:03:31 +02:00
Dismissed
june left a comment
Copy link

This looks good!
Just see the comments and two things:

  • Please add a README, see the forgejo_runner roles README as well as the certbot roles README for reference.
  • You pull in the docker_compose role as a dependency, which makes sense for having the directory be there of course. Thinking about this, we might want to pull in the entire docker config into the role (like we do for the Nextcloud role) or just add a comment to the README that the config must be provided externally. Think just clearing that up a bit like this avoids confusion in the future. In any case we can then also remove the host from the main docker compose group I suppose.
This looks good! Just see the comments and two things: - Please add a README, see the [`forgejo_runner` roles README](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/roles/forgejo_runner/README.md) as well as the [`certbot` roles README](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/roles/certbot/README.md) for reference. - You pull in the `docker_compose` role as a dependency, which makes sense for having the directory be there of course. Thinking about this, we might want to pull in the entire docker config into the role (like we do for the Nextcloud role) or just add a comment to the README that the config must be provided externally. Think just clearing that up a bit like this avoids confusion in the future. In any case we can then also remove the host from the main docker compose group I suppose.
roles/dooris/meta/argument_specs.yml Outdated
@ -0,0 +2,4 @@
main:
options:
dooris_static_api_token:
june commented 2026-07-19 17:58:51 +02:00
Owner
Copy link

Please add another underscore between role name and variable name to match the convention used in the other roles (so dooris__static_api_token).

Please add another underscore between role name and variable name to match the convention used in the other roles (so `dooris__static_api_token`).
lilly marked this conversation as resolved
roles/dooris/meta/argument_specs.yml Outdated
@ -0,0 +7,4 @@
required: true
type: str
dooris_url:
june commented 2026-07-19 17:59:04 +02:00
Owner
Copy link

Same here (so dooris__url).

Same here (so `dooris__url`).
lilly marked this conversation as resolved
lilly force-pushed new-dooris-role from aec9ba7c12
All checks were successful
/ build (pull_request) Successful in 27s
Details
/ Ansible Lint (pull_request) Successful in 2m33s
Details
/ Ansible Lint (push) Successful in 2m35s
Details
to 5efa02c79d
Some checks failed
/ build (pull_request) Successful in 27s
Details
/ Ansible Lint (push) Failing after 2m36s
Details
/ Ansible Lint (pull_request) Failing after 2m40s
Details
2026-07-23 18:58:05 +02:00 Compare
lilly force-pushed new-dooris-role from 5efa02c79d
Some checks failed
/ build (pull_request) Successful in 27s
Details
/ Ansible Lint (push) Failing after 2m36s
Details
/ Ansible Lint (pull_request) Failing after 2m40s
Details
to af1b1906b1
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
2026-07-23 19:03:28 +02:00 Compare
lilly force-pushed new-dooris-role from af1b1906b1
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
to cf7b7ebbed
Some checks failed
/ build (pull_request) Successful in 29s
Details
/ Ansible Lint (push) Failing after 3m15s
Details
/ Ansible Lint (pull_request) Failing after 3m14s
Details
2026-07-23 19:04:23 +02:00 Compare
lilly commented 2026-07-23 19:07:10 +02:00
Author
Owner
Copy link

@june I have included the requested changes and inlined the dependency configuration into the new dooris role

@june I have included the requested changes and inlined the dependency configuration into the new `dooris` role
june requested changes 2026-07-29 13:10:56 +02:00
Dismissed
june left a comment
Copy link

Thanks for the changes, looks good! Just two notes.

Thanks for the changes, looks good! Just two notes.
roles/dooris/meta/main.yml Outdated
@ -0,0 +9,4 @@
certbot__new_cert_commands:
- "systemctl restart nginx.service"
certbot__certs:
- commonName: "dooris.ccchh.net"
june commented 2026-07-29 13:10:07 +02:00
Owner
Copy link

This should probably use dooris__hostname.

This should probably use `dooris__hostname`.
lilly commented 2026-07-29 14:15:33 +02:00
Author
Owner
Copy link

good catch. fixed now

good catch. fixed now
lilly marked this conversation as resolved
roles/dooris/meta/main.yml Outdated
@ -0,0 +13,4 @@
challengeType: "dns-01-acme-dns"
dns_01_acme_dns:
subdomain: "37caae1f-b77f-4eb1-aa71-dc3f7ed24360"
apiUser: "fd42b696-a394-4e2a-8fcc-d44c9fac5d4e"
june commented 2026-07-29 13:10:36 +02:00
Owner
Copy link

Having those be hardcoded with all else being configurable is a bit awkward, so I think making these variables as well make sense.

Having those be hardcoded with all else being configurable is a bit awkward, so I think making these variables as well make sense.
lilly commented 2026-07-29 14:15:46 +02:00
Author
Owner
Copy link

is configurable and configured via host-var now

is configurable and configured via host-var now
lilly marked this conversation as resolved
lilly force-pushed new-dooris-role from cf7b7ebbed
Some checks failed
/ build (pull_request) Successful in 29s
Details
/ Ansible Lint (push) Failing after 3m15s
Details
/ Ansible Lint (pull_request) Failing after 3m14s
Details
to ef3b04d49d
Some checks failed
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
/ build (pull_request) Has been cancelled
Details
2026-07-29 14:14:41 +02:00 Compare
lilly force-pushed new-dooris-role from ef3b04d49d
Some checks failed
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
/ build (pull_request) Has been cancelled
Details
to 69ed60413a
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
2026-07-29 14:15:22 +02:00 Compare
lilly force-pushed new-dooris-role from 69ed60413a
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Has been cancelled
Details
/ Ansible Lint (pull_request) Has been cancelled
Details
to de8daaf56c
Some checks failed
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (pull_request) Failing after 3m49s
Details
/ cleanup-staging (pull_request) Successful in 6s
Details
/ build (push) Successful in 26s
Details
/ Ansible Lint (push) Failing after 3m35s
Details
2026-07-29 14:16:11 +02:00 Compare
june approved these changes 2026-07-29 14:52:35 +02:00
june left a comment
Copy link

Nice, thanks!!

Nice, thanks!!
lilly merged commit de8daaf56c into main 2026-07-29 15:07:00 +02:00
lilly deleted branch new-dooris-role 2026-07-29 15:07:00 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
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
Assignees
Clear assignees
No assignees
lilly
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!129
No description provided.