Compare commits

..
175 Commits
Author SHA1 Message Date
beatzaplenty caa6c3001a updated response codes on error pages and pve hostname in traefik config 2026-07-30 06:15:36 +10:00
beatzaplenty 7751662bb4 updated response codes 2026-07-20 02:14:56 +10:00
beatzaplenty cb855416db syntax issues 2026-07-17 11:14:14 +10:00
beatzaplenty faad7cc962 updated include filter 2026-07-17 11:12:47 +10:00
beatzaplenty afe2fce12d updated labels 2026-07-17 11:08:31 +10:00
beatzaplenty 7c6eb8c2a9 update wud tag filter 2026-07-17 11:04:04 +10:00
beatzaplenty 65cf245fbd updated line 2026-07-17 11:00:26 +10:00
beatzaplenty eb13c88e73 updated nextcloud wud tags 2026-07-17 10:59:48 +10:00
beatzaplenty daf02789ac added image tag 2026-07-17 10:36:46 +10:00
beatzaplenty 2954bcf671 seperate docker-socket-proxy from traefik network 2026-07-17 10:10:53 +10:00
git e733382f6c updated gitignore 2026-07-17 09:50:04 +10:00
beatzaplenty 80bdeb8d9d updated wud configuration 2026-07-17 09:42:46 +10:00
git dd9d798bae updated wud configuration 2026-07-17 09:23:23 +10:00
beatzaplenty 2073f953dd updated wud trigger config 2026-07-17 06:34:53 +10:00
beatzaplenty 6d85b51b52 updated profiles 2026-07-17 06:07:04 +10:00
beatzaplenty f88e45b783 updated profiles 2026-07-17 06:05:28 +10:00
beatzaplenty cc794c3896 added whats up docker 2026-07-17 06:02:29 +10:00
git dccff1d61c archived old monitoring system 2026-07-13 14:43:16 +10:00
beatzaplenty f17a8ee22c remove share path 2026-07-13 14:42:40 +10:00
beatzaplenty 8bb9ee242e add docekr volumes to beszel agent 2026-07-13 14:38:27 +10:00
git 46abc20577 migrated to beszel 2026-07-12 19:15:22 +10:00
beatzaplenty 065d59d68b updated uptime kuma image version 2026-07-07 12:30:33 +10:00
beatzaplenty d47635879a updated image versions 2026-07-07 12:25:12 +10:00
beatzaplenty f27d98b57f update after backup restore 2026-07-07 03:08:48 +10:00
beatzaplenty 656df7fb41 added data root 2026-07-07 01:15:41 +10:00
beatzaplenty b68d90bad5 update project root 2026-07-07 01:08:55 +10:00
beatzaplenty d25ffd8957 update project root 2026-07-07 01:07:08 +10:00
beatzaplenty c127e8a709 remove DATA_ROOT and update PROJECT_ROOT 2026-07-07 01:04:10 +10:00
beatzaplenty fb07135179 updated NFS shares 2026-07-07 00:59:32 +10:00
git eb68cdc425 updated crowdsec config 2026-07-06 16:12:05 +10:00
git 031ed3ac37 config updated 2026-07-02 21:20:01 +10:00
git 93b24200b1 updated configuration 2026-07-02 21:03:10 +10:00
git 951b37e78a Merge branch 'main' of https://gitea.lan.ddnsgeek.com/beatzaplenty/docker 2026-07-02 12:53:46 +10:00
git 5e47ae2777 moved to NFS share for volume storage. Migrated all data 2026-07-02 12:49:48 +10:00
beatzaplenty cc015fe9a2 Delete docker 2026-07-01 08:50:54 +00:00
git d9cce278e6 updated config 2026-06-24 12:04:29 +10:00
git e455438325 Authelia config updates and Nextcloud build clean up. added run all updates script 2026-06-01 08:41:23 +10:00
git f303ddd6a7 update influxdb ports
Validate Docs (Gitea) / validate (push) Failing after 38s
2026-05-20 05:47:19 +10:00
git c89b8129ec Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-05-13 14:52:27 +10:00
git c98b2d8232 Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-05-13 14:51:42 +10:00
beatzaplenty 3a9b3786c5 merge 2026-05-13 14:47:26 +10:00
beatzaplenty 1131eceb94 add socket proxy support 2026-05-13 14:45:32 +10:00
git 586be50567 Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-05-13 14:34:03 +10:00
beatzaplenty d0e08b8fc1 corrected docker-compose package name 2026-05-13 14:33:40 +10:00
git 487117b31a Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-05-13 14:29:09 +10:00
beatzaplenty 82fa90d843 install docker tooling to generate docs 2026-05-13 14:28:28 +10:00
git ef1e7432ee Merge branch 'main' of https://gitea.lan.ddnsgeek.com/beatzaplenty/docker 2026-05-13 14:16:08 +10:00
beatzaplenty 427ea20e43 updated gitea validation workflow 2026-05-13 14:15:05 +10:00
beatzaplenty 3298219ccf Update .gitea/workflows/generate-docs.yml
Validate Docs (Gitea) / validate (push) Failing after 3s
2026-05-13 04:05:39 +00:00
beatzaplenty b30c7f3a8a Update .gitea/workflows/validate-docs.yml
Validate Docs (Gitea) / validate (push) Failing after 5s
2026-05-13 04:05:12 +00:00
beatz174-bit 374511c123 Merge pull request #77 from beatz174-bit/codex/implement-dual-ci-workflow-for-docs-generation
Validate Docs (Gitea) / validate (push) Has been cancelled
ci: split docs generation to Gitea and docs validation/publish to GitHub
2026-05-13 14:01:16 +10:00
beatz174-bit 313f7f1c21 ci: use extended regex for docs secret scan 2026-05-13 14:00:52 +10:00
beatz174-bit 6aa78525c2 ci: split docs generation and publishing across gitea/github 2026-05-13 13:55:02 +10:00
beatz174-bit 5e0de23ff7 Merge pull request #75 from beatz174-bit/codex/update-docs-generation-workflow-for-reliability
Harden docs generation pipeline to refresh compose and Terraform data first
2026-05-13 13:42:20 +10:00
beatz174-bit 3c655dabcf Harden docs generation pipeline with strict source refresh 2026-05-13 13:40:50 +10:00
git 60e59f95a8 Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-05-13 10:32:02 +10:00
git cdf37fb2c9 Regenerate docs 2026-05-13 10:30:45 +10:00
beatz174-bit f56b734cb4 Merge pull request #74 from beatz174-bit/codex/fix-public-diagrams-generation-scripts
Fix generated public topology and routing diagrams to use inventory-aware concepts
2026-05-13 10:18:20 +10:00
beatz174-bit 10c4373c0e Fix invalid DOT cluster label emission for host inventory 2026-05-13 10:17:37 +10:00
beatz174-bit 2619d86dc1 Fix public topology/routing diagram generation and layout 2026-05-13 10:08:42 +10:00
git 1b679a4f09 Refine public docs diagrams 2026-05-13 09:48:45 +10:00
beatz174-bit 02033cd3f9 Merge pull request #73 from beatz174-bit/codex/refine-github-pages-documentation-and-diagrams
Remove Prometheus Rules from public docs; simplify physical and Traefik/DNS diagrams
2026-05-13 09:37:07 +10:00
beatz174-bit d932bc57d0 Remove stale Prometheus Rules nav from public MkDocs config 2026-05-13 09:36:23 +10:00
beatz174-bit c4cfa8081f Refine public docs generation and simplify topology diagrams 2026-05-13 09:33:29 +10:00
beatz174-bit 90c9094a6f Merge pull request #72 from beatz174-bit/codex/improve-documentation-with-generated-diagrams
Generate physical and Docker/Traefik/Dynu diagrams; require Graphviz and validate in CI
2026-05-13 09:18:29 +10:00
beatz174-bit 36c5f2b1e3 Restore legacy docker-compose diagram semantics 2026-05-13 09:17:47 +10:00
beatz174-bit 7bc2729ef6 Fix Traefik router backend targets in generated diagrams 2026-05-13 09:17:41 +10:00
beatz174-bit 9d79f828e4 Improve docs pipeline with generated topology diagrams 2026-05-13 09:08:47 +10:00
beatz174-bit 22b3659cdf Update publish-docs.yml 2026-05-13 08:53:35 +10:00
git 4440fddb2b docs: regenerate public docs 2026-05-13 08:51:51 +10:00
beatz174-bit d74000fbd0 Merge pull request #71 from beatz174-bit/codex/refactor-docs-pipeline-for-local-generation
docs: publish only committed public docs from GitHub Actions
2026-05-13 08:49:01 +10:00
beatz174-bit 9efdb5c781 Merge branch 'main' into codex/refactor-docs-pipeline-for-local-generation 2026-05-13 08:48:43 +10:00
beatz174-bit e7fd52616d docs: move public docs generation to local workflow 2026-05-13 08:47:23 +10:00
beatz174-bit b7b4b4d36d Merge pull request #70 from beatz174-bit/codex/fix-github-pages-to-deploy-public-docs-only
docs: publish GitHub Pages from docs/public only
2026-05-13 08:45:54 +10:00
beatz174-bit 40f5a3ce0d docs: publish only docs/public to GitHub Pages 2026-05-13 08:43:57 +10:00
beatz174-bit 8e43118661 docs: regenerate environment documentation 2026-05-12 22:35:56 +00:00
beatz174-bit 0e76f3cef1 Merge pull request #69 from beatz174-bit/codex/fix-docs-generation-for-docker-compose-profiles
Fix docs compose rendering by enabling `all` profile and add fail-fast check
2026-05-13 08:35:26 +10:00
beatz174-bit 8d18ab7059 Fix docs compose rendering to include all profiles 2026-05-13 08:33:26 +10:00
beatz174-bit 6a959d85c3 Merge pull request #68 from beatz174-bit/codex/add-mkdocs-publishing-to-github-pages
Add GitHub Pages MkDocs publish workflow
2026-05-13 08:29:06 +10:00
beatz174-bit 79c583eca3 Add MkDocs GitHub Pages publish workflow 2026-05-13 08:25:31 +10:00
beatz174-bit 7fcafed3f9 docs: regenerate environment documentation 2026-05-12 22:21:06 +00:00
beatz174-bit 0b67830d7f Merge pull request #67 from beatz174-bit/codex/update-github-actions-for-automated-docs-generation
docs: auto-commit generated docs on push and add browsable docs site structure
2026-05-13 08:20:21 +10:00
beatz174-bit d878a0f9b8 docs: make compose inventory generation deterministic 2026-05-13 08:19:39 +10:00
beatz174-bit 9c38910a67 docs: automate generated docs commits and add docs site structure 2026-05-13 08:09:51 +10:00
beatz174-bit 4a38a9421d Merge pull request #66 from beatz174-bit/codex/add-github-actions-for-docs-generation
docs: add GitHub Actions pipeline for compose documentation generation
2026-05-13 07:54:48 +10:00
beatz174-bit 5d32693925 docs: remove rg dependency and avoid archive compose fallback 2026-05-13 07:52:53 +10:00
beatz174-bit 696cecfecb ci: make compose installation resilient on ubuntu runners 2026-05-13 07:49:34 +10:00
beatz174-bit c0360a14b9 docs: add automated compose documentation generation pipeline 2026-05-13 07:45:57 +10:00
beatz174-bit 5589594d2c Merge pull request #65 from beatz174-bit/codex/add-dynu-dns-records-to-architecture-docs
Add optional Dynu DNS inventory support to architecture docs generation
2026-05-13 07:37:33 +10:00
beatz174-bit 0bd41b2fb1 Migrate legacy architecture heading during section upsert 2026-05-13 07:36:57 +10:00
beatz174-bit 5f10d0366e Add optional Dynu DNS inventory to architecture doc generator 2026-05-13 07:31:20 +10:00
git 9f98101c5d first dynu record generation 2026-05-13 07:23:20 +10:00
git 0c20676590 update .gitignore 2026-05-13 07:22:55 +10:00
beatz174-bit 59e2c2b9a3 Merge pull request #64 from beatz174-bit/codex/add-interactive-picker-for-terraform-outputs
Add interactive Terraform output picker for Dynu brownfield generator
2026-05-13 06:52:37 +10:00
beatz174-bit 61d49e85a3 Add interactive Terraform output picker for Dynu generator 2026-05-13 06:52:24 +10:00
beatz174-bit 8f84ed6d83 Merge pull request #63 from beatz174-bit/codex/fix-regexreplace-usage-in-terraform
Remove unsupported `regexreplace` usage from Dynu Terraform inventory
2026-05-13 06:42:07 +10:00
beatz174-bit 24cbb02bff Fix Dynu inventory by removing unsupported regexreplace usage 2026-05-13 06:40:25 +10:00
beatz174-bit 685a472572 Merge pull request #62 from beatz174-bit/codex/fix-dynu-brownfield-generator-keyerror
Fix Dynu brownfield generator output handling and state->enabled mapping
2026-05-13 06:37:33 +10:00
beatz174-bit 9de1bee542 Fix Dynu brownfield generator output handling 2026-05-13 06:37:10 +10:00
beatz174-bit 306e2c14db Merge pull request #61 from beatz174-bit/codex/update-terraform-for-dynu-dns-reconciliation
Add Dynu brownfield DNS inventory, outputs, and generator
2026-05-13 06:23:27 +10:00
beatz174-bit 63b47b59b5 Align wildcard DNS name sanitization across outputs and generator 2026-05-13 06:23:03 +10:00
beatz174-bit 52bd2d9fa2 Add Dynu brownfield DNS inventory outputs and generator 2026-05-13 06:03:32 +10:00
git 034ad17cf9 updated dynu terraform configuration 2026-05-13 05:37:59 +10:00
beatz174-bit ef2846562b Merge pull request #60 from beatz174-bit/codex/add-dynu-dns-terraform-documentation-layer-3vpdzo
dynu: add configurable root domain, import-ready domain resource, unpin provider version, and docs updates
2026-05-13 05:29:50 +10:00
beatz174-bit 52e2102f93 Merge branch 'main' into codex/add-dynu-dns-terraform-documentation-layer-3vpdzo 2026-05-13 05:29:40 +10:00
beatz174-bit a9b21912db Derive Dynu record FQDNs from configured root domain 2026-05-13 05:28:32 +10:00
beatz174-bit c9e4aeb8d6 Add dynu_record_import_id variable for record imports 2026-05-13 05:28:27 +10:00
beatz174-bit 96a44d5da6 Add dynu_root_domain variable for domain import flow 2026-05-13 05:18:02 +10:00
beatz174-bit 0d936677e5 Merge pull request #59 from beatz174-bit/codex/add-dynu-dns-terraform-documentation-layer-0fccdt
dynu: unpin provider, add domain skeleton, update imports/docs and records
2026-05-13 05:09:36 +10:00
beatz174-bit 5c38b92bc8 Remove Dynu provider version constraint 2026-05-13 05:09:17 +10:00
beatz174-bit fc5c882193 Merge pull request #58 from beatz174-bit/codex/add-host-topology-documentation-generator
Include VM-to-host mappings in Proxmox inventory output
2026-05-13 04:36:56 +10:00
beatz174-bit a4501d4034 Add VM inventory to proxmox outputs for host topology 2026-05-13 04:36:38 +10:00
beatz174-bit c0958d8f02 Merge pull request #57 from beatz174-bit/codex/add-dynu-dns-terraform-documentation-layer
Add Dynu Terraform brownfield DNS documentation layer
2026-05-13 03:36:03 +10:00
beatz174-bit 2a97864a06 Add Dynu Terraform brownfield DNS documentation layer 2026-05-13 03:17:37 +10:00
beatz174-bit bd23339edd Merge pull request #56 from beatz174-bit/codex/add-gitea-actions-runner-with-socket-proxy
Add Gitea Actions runner and configuration (compose, env, README)
2026-05-12 14:04:22 +10:00
beatz174-bit f8091a5c76 Use DOCKER_SOCKET_PROXY_HOST for gitea-runner Docker host 2026-05-12 14:03:57 +10:00
beatz174-bit 6a2639f931 Merge pull request #55 from beatz174-bit/codex/improve-dynu-dns-inventory-correlation
Harden Dynu/Traefik DNS correlation parsing and validation
2026-04-21 14:11:36 +10:00
beatz174-bit fae5e119d1 Harden Dynu/Traefik DNS correlation and validation 2026-04-21 14:11:25 +10:00
git 872038d0c9 first succesful build of dynu inventory 2026-04-21 13:57:16 +10:00
beatz174-bit 7a6db9fcfd Merge pull request #54 from beatz174-bit/codex/fix-dynu-api-authentication-error
Handle Dynu API auth failures without Python traceback
2026-04-21 13:52:16 +10:00
beatz174-bit d6a8979d55 Handle Dynu API auth failures without traceback 2026-04-21 13:52:01 +10:00
beatz174-bit a9a8a708d3 Merge pull request #53 from beatz174-bit/codex/fix-dynu-api-authentication-issue
Auto-load secrets/dynu.env, harden Dynu credential handling, and update docs
2026-04-21 13:38:52 +10:00
beatz174-bit 749c0d500d Improve Dynu env handling and document secrets/dynu.env 2026-04-21 13:38:33 +10:00
beatz174-bit 8f112af65b Merge pull request #52 from beatz174-bit/codex/integrate-dynu-dns-in-read-only-mode
Add read-only Dynu DNS inventory and Traefik correlation scripts
2026-04-21 12:45:50 +10:00
beatz174-bit 580e9b9aed Add strict read-only Dynu DNS inventory integration 2026-04-21 12:31:52 +10:00
beatz174-bit c77db36865 Merge pull request #51 from beatz174-bit/codex/add-basic-ansible-foundation
Add phase-1 Ansible foundation and safe validation hooks
2026-04-21 12:10:07 +10:00
beatz174-bit e11dc22999 Add phase-1 Ansible foundation and validation scaffolding 2026-04-21 12:07:29 +10:00
beatz174-bit 862ddd42f8 Merge pull request #50 from beatz174-bit/codex/update-documentation-for-codex-setup
docs: document Codex setup and maintenance scripts
2026-04-21 11:51:18 +10:00
beatz174-bit d0e7e52150 docs: add codex setup and maintenance script guidance 2026-04-21 11:51:02 +10:00
git f0aa9941d8 Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-04-21 11:34:21 +10:00
git 6789451bd6 moved codex environment scripts to repo 2026-04-21 11:33:50 +10:00
beatz174-bit b8d9e62954 Merge pull request #49 from beatz174-bit/codex/refactor-secret-inventory-and-documentation-structure
Refactor secrets inventory into docs and JSON source of truth
2026-04-21 11:25:04 +10:00
beatz174-bit 9f36dabcdc Refactor secrets inventory into docs + machine-readable JSON 2026-04-21 11:24:45 +10:00
beatz174-bit 3c78e9c140 Merge pull request #48 from beatz174-bit/codex/remove-unsupported-labels-from-containers
terraform(docker): remove unsupported docker_container labels arg and ignore label drift
2026-04-21 11:20:17 +10:00
beatz174-bit 40a976f712 terraform: remove docker_container labels args and ignore label drift 2026-04-21 11:20:08 +10:00
beatz174-bit 451be4ab0d Update AGENTS.md 2026-04-21 11:00:31 +10:00
beatz174-bit b848d6b807 Merge pull request #46 from beatz174-bit/codex/complete-terraform-documentation-for-docker
Document full Docker compose container inventory in Terraform docker layer
2026-04-21 09:46:46 +10:00
beatz174-bit 4695839df4 Manage container labels and expose labels in inventory output 2026-04-21 09:43:38 +10:00
beatz174-bit cb92ebc70e Fix Terraform container address and traefik runtime wiring 2026-04-21 09:43:33 +10:00
beatz174-bit 5c3bc0317c Merge pull request #47 from beatz174-bit/codex/perform-documentation-overhaul-for-repo
docs: refresh and expand repository documentation model
2026-04-21 09:35:33 +10:00
beatz174-bit c7dd9f2229 docs: overhaul repo documentation and workflow guides 2026-04-21 09:28:55 +10:00
beatz174-bit 7258d150ad Document full Docker compose container inventory in Terraform 2026-04-21 09:26:36 +10:00
git 020d6ecb79 created AGENTS.md 2026-04-21 09:04:59 +10:00
git b3cc235164 added physical machines 2026-04-21 08:43:15 +10:00
git b422a55c02 Updated terraform configurations 2026-04-20 22:23:20 +10:00
beatz174-bit b6d2e4ee62 Merge pull request #45 from beatz174-bit/codex/update-node-red-flow-for-idempotency
Make Grafana Docker Safe Update flow idempotent for repeated alerts
2026-04-15 07:42:34 +10:00
beatz174-bit 438cf57127 Make Grafana docker update flow idempotent after success 2026-04-15 07:42:00 +10:00
beatz174-bit 6ada434618 Merge pull request #44 from beatz174-bit/codex/create-script-to-automate-terraform-configuration-seiyl9
Add script to generate Terraform config from plan and document its usage
2026-04-14 20:19:10 +10:00
beatz174-bit 2a6c905eb8 Merge branch 'main' into codex/create-script-to-automate-terraform-configuration-seiyl9 2026-04-14 20:19:02 +10:00
beatz174-bit 9ad21c5846 Harden generated config temp path creation 2026-04-14 20:18:16 +10:00
beatz174-bit 2bab864d5e Merge pull request #43 from beatz174-bit/codex/create-script-to-automate-terraform-configuration
Add Terraform plan-to-config reconciliation script
2026-04-14 18:20:07 +10:00
beatz174-bit ebae1ed990 Add Terraform plan-to-config reconciliation script 2026-04-14 18:19:51 +10:00
beatz174-bit 5e49b6774b Merge pull request #42 from beatz174-bit/codex/scaffold-terraform-structure-for-homelab
Scaffold Terraform foundations for incremental Docker and Proxmox adoption
2026-04-14 18:09:15 +10:00
beatz174-bit 228413d780 Scaffold incremental Terraform foundations for docker and proxmox 2026-04-14 18:08:56 +10:00
git 7279ade925 new file: infrastructure/.gitignore
new file:   infrastructure/terraform/bootstrap/backend.tf
	new file:   infrastructure/terraform/bootstrap/main.tf
	new file:   infrastructure/terraform/bootstrap/outputs.tf
	new file:   infrastructure/terraform/bootstrap/providers.tf
	new file:   infrastructure/terraform/bootstrap/variables.tf
	new file:   infrastructure/terraform/docker/.terraform.lock.hcl
	new file:   infrastructure/terraform/docker/main.tf
	modified:   monitoring/node-red/data/context/00b02bbd01c91485/flow.json
	modified:   monitoring/node-red/data/update-events.ndjson
2026-04-14 17:42:30 +10:00
git a826c85e08 modified: apps/gramps/docker-compose.yml
modified:   default-environment.env
2026-04-14 16:24:42 +10:00
beatz174-bit 1918b83061 Merge pull request #41 from beatz174-bit/codex/update-gramps-deployment-to-use-gramps-web-u6wwj9
Replace Gramps Postgres service with GrampsWeb + Celery + Redis and update secrets/docs
2026-04-14 14:36:08 +10:00
beatz174-bit fa54b956a7 Merge branch 'main' into codex/update-gramps-deployment-to-use-gramps-web-u6wwj9 2026-04-14 14:35:33 +10:00
beatz174-bit d69c74e537 Add healthchecks for Gramps celery and valkey services 2026-04-14 14:34:31 +10:00
git 0654d9673f modified: apps/gramps/docker-compose.yml 2026-04-14 14:30:09 +10:00
beatz174-bit ff0c413d06 Merge pull request #40 from beatz174-bit/codex/update-gramps-deployment-to-use-gramps-web
Update Gramps to file-backed Gramps Web stack with Celery and Valkey
2026-04-14 14:26:32 +10:00
beatz174-bit f69028963b Update Gramps to file-backed Gramps Web stack with celery and valkey 2026-04-14 14:25:54 +10:00
git 624d7be17c modified: default-environment.env
modified:   monitoring/node-red/data/.flows.json.backup
	modified:   monitoring/node-red/data/update-events.ndjson
2026-04-14 12:33:18 +10:00
beatz174-bit b17adee7cc Merge pull request #39 from beatz174-bit/codex/refactor-and-extend-mtls-bridge-for-dynamic-endpoints
mtls-bridge: preserve request paths, add allow-list and configurable health endpoint
2026-04-14 12:08:25 +10:00
beatz174-bit 27c5c3f631 Add optional allow-list support for mtls-bridge paths 2026-04-14 12:07:17 +10:00
git 361d2dc87b modified: core/traefik/traefik.yml
modified:   default-environment.env
	modified:   monitoring/mtls-bridge/docker-compose.yml
	modified:   monitoring/node-red/data/context/00b02bbd01c91485/flow.json
	modified:   monitoring/node-red/data/update-events.ndjson
2026-04-14 11:32:19 +10:00
git 2499924afc Merge branch 'main' of https://github.com/beatz174-bit/docker
monitoring/mtls-bridge/docker-compose.yml

	modified:   monitoring/mtls-bridge/README.md
	modified:   monitoring/mtls-bridge/docker-compose.yml
2026-04-14 11:11:47 +10:00
git b2ff514a71 modified: core/traefik/traefik.yml
modified:   default-environment.env
	modified:   monitoring/mtls-bridge/docker-compose.yml
	modified:   monitoring/node-red/data/context/00b02bbd01c91485/flow.json
	modified:   monitoring/node-red/data/update-events.ndjson
2026-04-14 11:08:57 +10:00
beatz174-bit b5cfdde00f Merge pull request #38 from beatz174-bit/codex/add-traefik-label-for-basic-authentication-s6q3tm
Add Traefik basic-auth and CORS middlewares to mtls-bridge and document env vars
2026-04-14 11:08:40 +10:00
beatz174-bit d99e2767b5 Merge branch 'main' into codex/add-traefik-label-for-basic-authentication-s6q3tm 2026-04-14 11:08:34 +10:00
beatz174-bit 7f8e920fa1 Add CORS and OPTIONS handling for mtls-bridge panel actions 2026-04-14 11:06:45 +10:00
git c10b834be0 Merge branch 'main' of https://github.com/beatz174-bit/docker 2026-04-14 09:34:26 +10:00
git f08a567933 modified: monitoring/mtls-bridge/docker-compose.yml
modified:   monitoring/node-red/data/update-events.ndjson
	modified:   update-containers.log
2026-04-14 09:34:12 +10:00
beatz174-bit 85d7859b14 Merge pull request #37 from beatz174-bit/codex/add-traefik-label-for-basic-authentication
Add Traefik basic-auth labels to mtls-bridge
2026-04-14 09:32:54 +10:00
beatz174-bit d06c53ef0b Add Traefik basic auth middleware for mtls-bridge 2026-04-14 09:32:18 +10:00
308 changed files with 13068 additions and 8072 deletions

No files matched your search

+71
View File
@@ -0,0 +1,71 @@
name: Generate Docs
on:
workflow_dispatch:
schedule:
- cron: "0 */6 * * *"
jobs:
generate:
runs-on: ubuntu-latest
env:
DOCKER_HOST: tcp://docker-socket-proxy:2375
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install docker CLI
run: |
apt-get update
apt-get install -y docker.io docker-compose
- name: Generate docs
run: |
scripts/docs/generate-all.sh
- name: Validate generated docs
run: |
set -e
test -s docs/generated/docker-compose.resolved.yml
test -s docs/generated/host-topology.md
test -s docs/public/physical-topology.svg
test -s docs/public/docker-traefik-dynu.svg
! grep -R "Host inventory JSON not found" docs/public docs/diagrams
! grep -R "Generate terraform inventory" docs/public docs/diagrams
# Ensure no obvious secrets leaked
! grep -R -E -i "password|token|api[_-]?key|secret" docs/public \
|| (echo "Secret-like string detected"; exit 1)
- name: Commit changes
run: |
git config user.name "docs-bot"
git config user.email "docs-bot@local"
git add docs/generated docs/diagrams docs/public data/terraform/proxmox-inventory.json || true
if git diff --cached --quiet; then
echo "No changes to commit"
exit 0
fi
git commit -m "docs: regenerate documentation artifacts"
- name: Push to Gitea
run: |
git push origin HEAD:main
- name: Push to GitHub mirror
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_PUSH_TOKEN }}
GITHUB_MIRROR_REPO: ${{ vars.GITHUB_MIRROR_REPO }}
run: |
test -n "$GITHUB_TOKEN"
test -n "$GITHUB_MIRROR_REPO"
git remote add github "https://$GITHUB_TOKEN@github.com/$GITHUB_MIRROR_REPO.git" || true
git push github HEAD:main
+24
View File
@@ -0,0 +1,24 @@
name: Validate Docs (Gitea)
on:
push:
branches: [ main ]
paths:
- "docs/**"
jobs:
validate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Validate docs
run: |
set -e
test -d docs/public
test -s docs/public/physical-topology.svg
! grep -R "Host inventory JSON not found" docs/public
! grep -R "Generate terraform inventory" docs/public
+35
View File
@@ -0,0 +1,35 @@
name: Validate committed public docs
on:
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:
permissions:
contents: read
jobs:
validate-public-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Ensure committed docs/public exists
run: |
test -d docs/public
test -n "$(find docs/public -mindepth 1 -print -quit)"
- name: Install MkDocs
run: |
python3 -m pip install --user mkdocs
- name: Validate docs content
run: |
set -e
test -s docs/public/physical-topology.svg
test -s docs/public/docker-traefik-dynu.svg
! grep -R "Host inventory JSON not found" docs/public
! grep -R "Generate terraform inventory" docs/public
! rg -n -i "password|token|api[_-]?key|secret" docs/public
- name: Build MkDocs site
run: |
python3 -m mkdocs build -f mkdocs-public.yml --strict
+84
View File
@@ -0,0 +1,84 @@
name: Publish documentation site
on:
push:
branches:
- main
workflow_dispatch:
permissions:
contents: read
pages: write
id-token: write
concurrency:
group: github-pages
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Ensure committed docs/public exists
run: |
test -d docs/public
test -n "$(find docs/public -mindepth 1 -print -quit)"
- name: Install Graphviz
run: |
sudo apt-get update
sudo apt-get install -y graphviz
dot -V
- name: Validate sanitized diagram artifacts
run: |
test -f docs/public/physical-topology.svg
test -f docs/public/docker-traefik-dynu.svg
! rg -n "Graphviz dot not found" docs/public/*.svg
! rg -n "lan\.ddnsgeek\.com" docs/public/*.svg docs/public/*.md
! rg -n -i "password|token|api_key|secret" docs/public/*.svg
- name: Install MkDocs
run: |
python3 -m pip install --user mkdocs
- name: Build public MkDocs site
run: |
python3 -m mkdocs build -f mkdocs-public.yml --strict
- name: Verify published content excludes internal/generated docs
run: |
test -d site-public
test ! -e site-public/generated
test ! -e site-public/docker
- name: Verify expected 404-only paths are not generated
run: |
test ! -e site-public/generated/compose-inventory/index.html
test ! -e site-public/generated/prometheus-rules/index.html
test ! -e site-public/docker/index.html
- name: Configure GitHub Pages
uses: actions/configure-pages@v5
- name: Upload GitHub Pages artifact
uses: actions/upload-pages-artifact@v3
with:
path: site-public
deploy:
runs-on: ubuntu-latest
needs: build
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
+25 -1
View File
@@ -4,13 +4,14 @@
#!**/Dockerfile #!**/Dockerfile
#!docker-compose.yml #!docker-compose.yml
**/data/ **/data/
apps/gitea/runner-data/
**/db/ **/db/
**/database/ **/database/
apps/nextcloud/config/ apps/nextcloud/config/
core/crowdsec/config/ core/crowdsec/config/
**/.env **/.env
!monitoring/node-red/data/ !monitoring/node-red/data/
apps/stockfill/ apps/stockfill
apps/shift-recorder/ apps/shift-recorder/
!apps/searxng/ !apps/searxng/
@@ -24,6 +25,29 @@ monitoring/influxdb/*
!monitoring/influxdb/docker-compose.yml !monitoring/influxdb/docker-compose.yml
secrets/* secrets/*
!secrets/.env.secrets.example !secrets/.env.secrets.example
!secrets/inventory.json
!.env.example !.env.example
core/traefik/certs/* core/traefik/certs/*
!core/traefik/certs/.gitkeep !core/traefik/certs/.gitkeep
site/
# Docs generation artifacts intentionally tracked
!data/terraform/proxmox-inventory.json
!infrastructure/terraform/dynu/generated/
!infrastructure/terraform/dynu/generated/dynu_dns_records_inventory.json
!docs/generated/
!docs/generated/docker-compose.resolved.yml
!docs/generated/host-topology.md
!docs/diagrams/
!docs/diagrams/*.svg
!docs/public/
!docs/public/*.md
!docs/public/*.svg
# Terraform local/state artifacts
**/.terraform/
**/.terraform.lock.hcl
*.tfstate
*.tfstate.*
*.tfvars
*.tfvars.json
+80
View File
@@ -0,0 +1,80 @@
# Codex instructions for this repository
This repository contains:
- Docker Compose infrastructure
- Terraform configuration
- Ansible configuration
## General rules
Prefer validation and linting over execution.
Do not make assumptions about runtime access.
Do not run destructive commands.
Do not install repo changes unless explicitly requested.
## Docker / Compose rules
This environment does not have Docker daemon access.
Do not use commands that require `/var/run/docker.sock`.
Allowed:
- `docker compose config`
- `docker compose -f <file> config`
- `./services-up.sh --profile all config`
Not allowed:
- `docker compose up`
- `docker compose down`
- `docker compose run`
- `docker compose exec`
- `docker build`
- `docker pull`
When validating Docker changes:
1. Prefer `./services-up.sh --profile all config` if available.
2. If that does not fit the task, use `docker compose -f ... config`.
3. Only create temporary placeholder env files if validation requires them.
4. Do not commit placeholder env files unless explicitly requested.
## Terraform rules
Allowed:
- `terraform fmt -check -recursive`
- `terraform init -backend=false -input=false`
- `terraform validate`
- `tflint`
Do not apply infrastructure changes unless explicitly requested.
Do not run:
- `terraform apply`
- `terraform destroy`
If `terraform init` fails because access to `registry.terraform.io` is forbidden, do not summarize the error vaguely. Report the exact stderr. Continue with:
- `terraform fmt -check -recursive`
- static review of changed `.tf` files
Only run `terraform validate` when provider installation is available locally or registry access succeeds.
## Ansible rules
Allowed:
- `ansible-lint`
- `ansible-playbook --syntax-check <playbook>`
Do not run playbooks against real hosts unless explicitly requested.
## Shell / YAML rules
Allowed:
- `shellcheck`
- `yamllint`
- `yq`
- `jq`
## Expected workflow
When making changes:
1. Edit the smallest necessary set of files.
2. Run the safest available validation commands.
3. Report validation results clearly.
4. If validation is blocked by missing secrets, env files, or remote/provider access, say so explicitly instead of guessing.
-49
View File
@@ -1,49 +0,0 @@
# Deployment prerequisites (required)
Before running `docker compose up`, you **must** provision runtime secrets.
## 1) Create non-committed secret files
```bash
cp secrets/.env.secrets.example secrets/stack-secrets.env
chmod 600 secrets/stack-secrets.env
```
Create these Docker secret files (all ignored by git):
- `secrets/nextcloud_db_root_password.txt`
- `secrets/nextcloud_db_password.txt`
- `secrets/nextcloud_admin_password.txt`
- `secrets/nextcloud_smtp_password.txt`
- `secrets/nextcloud_redis_password.txt`
- `secrets/passbolt_db_password.txt`
- `secrets/gramps_db_password.txt`
- `secrets/influxdb_init_password.txt`
- `secrets/prometheus_kuma_basic_auth_password.txt`
Recommended permissions:
```bash
chmod 600 secrets/*.txt
```
## 2) Rotate previously committed credentials
These values were previously hardcoded and must be rotated in upstream systems immediately:
- Database credentials (Nextcloud, Passbolt, Gramps, InfluxDB).
- Nextcloud SMTP app password.
- Authelia reset JWT secret, session secret, storage encryption key.
- Traefik CrowdSec LAPI key.
- Gotify admin password.
- Prometheus Uptime Kuma basic-auth password.
## 3) Start stack
After secrets are provisioned:
```bash
docker compose -f core/docker-compose.yml up -d
docker compose -f monitoring/prometheus/docker-compose.yml up -d
docker compose -f apps/nextcloud/docker-compose.yml up -d
```
+146 -4
View File
@@ -1,8 +1,83 @@
# Docker + Traefik Homelab Stack # Homelab Docker + Terraform Inventory Repository
This repository defines a multi-compose Docker environment with Traefik as ingress, app workloads, and a monitoring/alerting plane. This repository is both:
## High-Level Architecture 1. **operational** (Docker Compose application/runtime definition), and
2. **documentary/inventory-oriented** (Terraform capture of Proxmox VMs, host metadata, and selected Docker objects).
If you only read one section, read **[Source-of-truth boundaries](docs/source-of-truth.md)** first.
---
## Quick navigation
- Architecture overview: [docs/architecture.md](docs/architecture.md)
- Repository layout: [docs/repo-structure.md](docs/repo-structure.md)
- Source-of-truth boundaries and guardrails: [docs/source-of-truth.md](docs/source-of-truth.md)
- Docker environment composition and `services-up.sh`: [docs/docker-environment.md](docs/docker-environment.md)
- Terraform workflows (brownfield import/reconciliation): [docs/terraform-workflows.md](docs/terraform-workflows.md)
- Infrastructure inventory intent and outputs: [docs/infrastructure-inventory.md](docs/infrastructure-inventory.md)
- Dynu DNS read-only inventory workflow: [docs/dynu-dns-inventory.md](docs/dynu-dns-inventory.md)
- Generated host topology doc: [docs/generated/host-topology.md](docs/generated/host-topology.md)
- Ansible bootstrap workflows: [docs/ansible-workflows.md](docs/ansible-workflows.md)
- Deployment prerequisites and secrets setup: [docs/deployment-prerequisites.md](docs/deployment-prerequisites.md)
- Secrets inventory: [docs/security-secrets.md](docs/security-secrets.md)
Codex helper scripts:
- Initial Codex environment/bootstrap setup: [scripts/codex-setup.sh](scripts/codex-setup.sh)
- Codex environment maintenance/refresh: [scripts/codex-maintenance.sh](scripts/codex-maintenance.sh)
Infrastructure subtrees:
- Ansible foundation docs: [infrastructure/ansible/README.md](infrastructure/ansible/README.md)
- Terraform root docs: [infrastructure/terraform/README.md](infrastructure/terraform/README.md)
- Terraform Docker mirror: [infrastructure/terraform/docker/README.md](infrastructure/terraform/docker/README.md)
- Terraform Proxmox inventory: [infrastructure/terraform/proxmox/README.md](infrastructure/terraform/proxmox/README.md)
---
## Operating model
### Docker Compose (runtime authority)
- Compose files under `core/`, `apps/`, and `monitoring/` describe runtime services.
- `services-up.sh` composes the environment by discovering compose files and applying common env/network inputs.
- For service runtime behavior, start from Compose files and `services-up.sh` (not Terraform).
### Ansible (bootstrap foundation)
- Ansible under `infrastructure/ansible/` is a phase-1 foundation for inventory/configuration scaffolding.
- It supports safe validation (inventory parsing and playbook syntax checks) while hosts/devices are onboarded gradually.
- It does not replace Compose runtime authority or Terraform reconciliation authority at this stage.
### Terraform (inventory and reconciliation authority)
- Terraform under `infrastructure/terraform/` is used to codify and reconcile existing infrastructure.
- Current repo usage emphasizes **brownfield import-first workflows** and safe reconciliation.
- Terraform captures:
- Proxmox VM configuration for existing VMs.
- Physical host metadata in locals/outputs.
- Documentation-oriented Docker container mirroring (limited, selective).
Terraform here is **not** a replacement for Docker Compose deployment.
---
## Guardrails
- Do not run destructive Terraform commands casually.
- Do not treat generated Terraform config as final without manual review.
- Do not commit real secrets, credentials, or local state.
- Keep one-resource-per-file patterns where already established in Terraform subdirectories.
- Prefer shaping outputs for documentation/tooling consumption over dumping raw provider objects.
See [docs/source-of-truth.md](docs/source-of-truth.md) and [docs/terraform-workflows.md](docs/terraform-workflows.md) for concrete do/don't guidance.
---
## High-level architecture
```mermaid ```mermaid
flowchart TB flowchart TB
@@ -43,4 +118,71 @@ flowchart TB
Prometheus --> Gotify Prometheus --> Gotify
``` ```
For a request-flow/network view and architecture notes, see [docs/architecture.md](docs/architecture.md). For request-flow and network detail, see [docs/architecture.md](docs/architecture.md).
## Public docs publication workflow
Public docs are generated on the Docker host and committed to this repository. GitHub Actions only publishes committed content from `docs/public`.
1. Generate public docs locally from the repository root:
```bash
./scripts/generate-public-docs.sh
```
2. Inspect the generated changes:
```bash
git diff -- docs/public docs/generated docs/diagrams
```
3. Commit the generated public docs (and any supporting generated files you intend to version):
```bash
git add docs/public docs/generated docs/diagrams
git commit -m "docs: regenerate public docs"
```
4. Push your branch:
```bash
git push
```
Only files under `docs/public` are published by GitHub Pages. Internal/generated documentation is not published unless it is deliberately copied/sanitized into `docs/public`.
### Regenerating architecture docs (Prometheus + Dynu DNS)
```bash
# Refresh Dynu live inventory and generated resources/import helpers
cd infrastructure/terraform/dynu
terraform apply -refresh-only
python3 scripts/generate-brownfield-records.py --overwrite
# Regenerate architecture docs from Prometheus + Dynu inventory
cd ../../..
python3 scripts/render_prometheus_docs.py \
--inventory-file docs/runtime/prometheus-inventory.json \
--dynu-dns-inventory-file infrastructure/terraform/dynu/generated/dynu_dns_records_inventory.json
```
---
## Codex setup and maintenance scripts
The repository includes helper scripts for Codex sessions that need local tooling and safe placeholder secret material for validation-only workflows:
- `scripts/codex-setup.sh`
- Installs baseline CLI dependencies (shell/yaml/terraform/ansible tooling).
- Prepares `secrets/stack-secrets.env` from templates and creates dummy file-based secret placeholders based on `secrets/inventory.json`.
- Installs/refreshed baseline Ansible collections when `infrastructure/ansible/collections/requirements.yml` is present.
- Runs safe Ansible bootstrap checks (version, inventory parse, playbook syntax check) without live connectivity operations.
- Prints installed tool versions for quick verification.
- `scripts/codex-maintenance.sh`
- Refreshes Python-based linting/automation tooling.
- Reconciles placeholder secret files against current `secrets/inventory.json` (creates missing, removes stale).
- Rebuilds `secrets/stack-secrets.env` with dummy values for compose-config validation.
- Refreshes Ansible collections and repeats safe inventory/syntax validation checks.
Both scripts are intended for local validation environments and should not be treated as production provisioning automation.
-40
View File
@@ -1,40 +0,0 @@
# Security Secrets Inventory
This inventory is aligned with `secrets/.env.secrets.example` and documents only the values that are expected to be set in the non-committed secrets env file (`secrets/stack-secrets.env`).
## Secrets expected in `secrets/.env.secrets.example`
| Variable | Used by | Purpose / Notes |
|---|---|---|
| `NEXTCLOUD_DB_USER` | `apps/nextcloud/docker-compose.yml` | Nextcloud database username (non-secret identifier but environment-specific). |
| `NEXTCLOUD_ADMIN_USER` | `apps/nextcloud/docker-compose.yml` | Initial Nextcloud admin username. |
| `NEXTCLOUD_SMTP_FROM_ADDRESS` | `apps/nextcloud/docker-compose.yml` | SMTP sender local-part for outbound mail configuration. |
| `NEXTCLOUD_SMTP_DOMAIN` | `apps/nextcloud/docker-compose.yml` | SMTP sender domain for outbound mail configuration. |
| `NEXTCLOUD_SMTP_NAME` | `apps/nextcloud/docker-compose.yml` | Derived from address + domain in the example file. |
| `PASSBOLT_DB_NAME` | `apps/passbolt/docker-compose.yml` | Passbolt database name. |
| `PASSBOLT_DB_USER` | `apps/passbolt/docker-compose.yml` | Passbolt database username. |
| `PASSBOLT_GPG_SERVER_KEY_FINGERPRINT` | `apps/passbolt/docker-compose.yml` | Passbolt server GPG key fingerprint. |
| `GRAMPS_DB_NAME` | `apps/gramps/docker-compose.yml` | Gramps database name. |
| `GRAMPS_DB_USER` | `apps/gramps/docker-compose.yml` | Gramps database username. |
| `GRAMPS_DB_PASSWORD` | `apps/gramps/docker-compose.yml` | Gramps database password. |
| `GRAMPS_INITIAL_ADMIN` | `apps/gramps/docker-compose.yml` | Gramps initial admin username/email (deployment-specific). |
| `GRAMPS_INITIAL_ADMIN_PASSWORD` | `apps/gramps/docker-compose.yml` | Gramps initial admin password. |
| `GRAMPS_DB_URI` | `apps/gramps/docker-compose.yml` | Derived connection string in the example file. |
| `GOTIFY_DEFAULTUSER_NAME` | `monitoring/gotify/docker-compose.yml` | Gotify default username. |
| `GOTIFY_DEFAULTUSER_PASS` | `monitoring/gotify/docker-compose.yml` | Gotify default user password. |
| `INFLUXDB_INIT_USERNAME` | `monitoring/prometheus/docker-compose.yml` | InfluxDB initial username. |
| `PIHOLE_PASSWORD` | `monitoring/prometheus/docker-compose.yml` | Exporter auth / Pi-hole integration password. |
## Managed outside `.env.secrets.example`
The following sensitive values are intentionally not duplicated in `secrets/.env.secrets.example` because they are provided via Docker secrets (`*_FILE`) or other mounted secret files:
- Database/root passwords for Nextcloud, Passbolt, and supporting services that are wired through Docker secrets.
- Redis runtime password (`--requirepass`) loaded from a Docker secret.
- `DOCKER_INFLUXDB_INIT_PASSWORD` loaded from Docker secret in monitoring.
- Uptime Kuma basic auth password loaded via `password_file` in Prometheus config.
- Core stack secrets injected via env substitution in committed config files, such as:
- `AUTHELIA_JWT_SECRET`
- `AUTHELIA_SESSION_SECRET`
- `AUTHELIA_STORAGE_ENCRYPTION_KEY`
- `CROWDSEC_LAPI_KEY`
+55
View File
@@ -0,0 +1,55 @@
# Gitea
## Gitea Actions
Gitea Actions is enabled by setting:
- `GITEA__actions__ENABLED=true`
## Runner service
The repository includes a dedicated Gitea Actions runner service named:
- `gitea-runner`
The runner uses Docker through the existing Docker socket proxy:
- `DOCKER_HOST=tcp://docker-socket-proxy:2375`
The runner intentionally **does not** mount:
- `/var/run/docker.sock`
## Registration token
Generate a runner registration token from the Gitea UI:
- Site Administration → Actions → Runners
- or Repo → Settings → Actions → Runners
Put the token in your env/secrets file:
- `GITEA_RUNNER_REGISTRATION_TOKEN=...`
## Start the runner
- `./services-up.sh --profile gitea up -d gitea-runner`
- or `./services-up.sh --profile all up -d gitea-runner`
## Logs
- `docker logs -f gitea-runner`
## Labels
Common workflow label:
- `runs-on: ubuntu-latest`
This should match the configured labels, for example:
- `GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bookworm,...`
## Security note
The runner can control Docker through `docker-socket-proxy`. This is safer than mounting the raw Docker socket directly, but workflows still have meaningful control over Docker. Only trusted repositories/users should be allowed to run workflows on this runner.
+25 -1
View File
@@ -9,8 +9,10 @@ services:
- USER_GID=${GITEA_USER_GID} - USER_GID=${GITEA_USER_GID}
- GITEA__database__DB_TYPE=${GITEA_DB_TYPE} - GITEA__database__DB_TYPE=${GITEA_DB_TYPE}
- GITEA__server__ROOT_URL=${GITEA_ROOT_URL} - GITEA__server__ROOT_URL=${GITEA_ROOT_URL}
- GITEA__actions__ENABLED=true
volumes: volumes:
- ${PROJECT_ROOT}/apps/gitea/data:/data # - ${PROJECT_ROOT}/apps/gitea/data:/data
- ${DOCKER_VOLUMES}/gitea/data:/data
networks: networks:
- traefik - traefik
@@ -23,6 +25,7 @@ services:
- "traefik.http.services.gitea.loadbalancer.server.port=3000" - "traefik.http.services.gitea.loadbalancer.server.port=3000"
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "wud.watch=true"
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl -fsS http://localhost:3000/api/healthz >/dev/null"] test: ["CMD-SHELL", "curl -fsS http://localhost:3000/api/healthz >/dev/null"]
@@ -31,6 +34,27 @@ services:
retries: 6 retries: 6
start_period: 120s start_period: 120s
gitea-runner:
profiles: ["apps","all","gitea","ci"]
container_name: gitea-runner
image: gitea/act_runner:latest
restart: always
depends_on:
- gitea
- docker-socket-proxy
environment:
- GITEA_INSTANCE_URL=${GITEA_ROOT_URL}
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN}
- GITEA_RUNNER_NAME=${GITEA_RUNNER_NAME}
- GITEA_RUNNER_LABELS=${GITEA_RUNNER_LABELS}
- DOCKER_HOST=${DOCKER_SOCKET_PROXY_HOST}
volumes:
# - ${PROJECT_ROOT}/apps/gitea/runner-data:/data
- ${DOCKER_VOLUMES}/gitea/runner:/data
networks:
- traefik
- docker-socket-proxy
#volumes: #volumes:
# gitea_data: # gitea_data:
+121 -49
View File
@@ -1,58 +1,58 @@
services: services:
gramps-db:
profiles: ["apps","all","gramps"]
image: postgres:13
container_name: gramps-db
restart: always
env_file:
- ${SECRETS_ENV_FILE}
environment:
POSTGRES_USER: ${GRAMPS_DB_USER}
POSTGRES_PASSWORD_FILE: /run/secrets/gramps_db_password
POSTGRES_DB: ${GRAMPS_DB_NAME}
secrets:
- gramps_db_password
volumes:
- ${PROJECT_ROOT}/apps/gramps/db:/var/lib/postgresql
networks:
- gramps
healthcheck:
test: ["CMD-SHELL", "pg_isready -h gramps-db -p 5432 -U $$POSTGRES_USER -d $$POSTGRES_DB"]
interval: 10s
timeout: 5s
retries: 12
start_period: 30s
grampsweb: grampsweb:
profiles: ["apps","all","gramps"] profiles: ["apps","all","gramps"]
image: ghcr.io/gramps-project/grampsweb:latest image: ghcr.io/gramps-project/grampsweb:latest
container_name: gramps-web container_name: gramps-web
depends_on: depends_on:
- gramps-db - gramps-redis
- grampsweb_celery
restart: always restart: always
env_file: # env_file:
- ${SECRETS_ENV_FILE} # - ${SECRETS_ENV_FILE}
environment: environment:
DB_URI: ${GRAMPS_DB_URI} TZ: ${TZ}
GRAMPSWEB_LOGLEVEL: ${GRAMPSWEB_LOGLEVEL} GRAMPSWEB_TREE: ${GRAMPSWEB_TREE}
# default admin user created on first run: GRAMPSWEB_BASE_URL: ${GRAMPSWEB_BASE_URL}
INITIAL_ADMIN: ${GRAMPS_INITIAL_ADMIN} GRAMPSWEB_SECRET_KEY: ${GRAMPSWEB_SECRET_KEY}
INITIAL_ADMIN_PASSWORD: ${GRAMPS_INITIAL_ADMIN_PASSWORD} GRAMPSWEB_REGISTRATION_DISABLED: ${GRAMPSWEB_REGISTRATION_DISABLED}
# optional: storage paths inside container GRAMPSWEB_EMAIL_HOST: ${GRAMPSWEB_EMAIL_HOST}
GRAMPSWEB_MEDIAPATH: ${GRAMPSWEB_MEDIAPATH} GRAMPSWEB_EMAIL_PORT: ${GRAMPSWEB_EMAIL_PORT}
GRAMPSWEB_TREE: "${GRAMPSWEB_TREE}" GRAMPSWEB_EMAIL_HOST_USER: ${GRAMPSWEB_EMAIL_HOST_USER}
GRAMPSWEB_EMAIL_HOST_PASSWORD: ${GRAMPSWEB_EMAIL_HOST_PASSWORD}
GRAMPSWEB_EMAIL_USE_SSL: ${GRAMPSWEB_EMAIL_USE_SSL}
GRAMPSWEB_EMAIL_USE_STARTTLS: ${GRAMPSWEB_EMAIL_USE_STARTTLS}
GRAMPSWEB_DEFAULT_FROM_EMAIL: ${GRAMPSWEB_DEFAULT_FROM_EMAIL}
GRAMPSWEB_CELERY_CONFIG__broker_url: redis://gramps-redis:6379/0
GRAMPSWEB_CELERY_CONFIG__result_backend: redis://gramps-redis:6379/0
GRAMPSWEB_RATELIMIT_STORAGE_URI: redis://gramps-redis:6379/1
volumes: volumes:
- ${PROJECT_ROOT}/apps/gramps/data/users:/app/users # - ${PROJECT_ROOT}/apps/gramps/data/users:/app/users
- ${PROJECT_ROOT}/apps/gramps/data/media:/app/media # - ${PROJECT_ROOT}/apps/gramps/data/index:/app/indexdir
- ${PROJECT_ROOT}/apps/gramps/data/cache:/app/cache # - ${PROJECT_ROOT}/apps/gramps/data/thumbnail_cache:/app/thumbnail_cache
# - ${PROJECT_ROOT}/apps/gramps/data/cache:/app/cache
# - ${PROJECT_ROOT}/apps/gramps/data/secret:/app/secret
# - ${PROJECT_ROOT}/apps/gramps/data/db:/root/.gramps/grampsdb
# - ${PROJECT_ROOT}/apps/gramps/data/media:/app/media
# - ${PROJECT_ROOT}/apps/gramps/data/tmp:/tmp
- ${DOCKER_VOLUMES}/gramps-data/users:/app/users
- ${DOCKER_VOLUMES}/gramps-data/index:/app/indexdir
- ${DOCKER_VOLUMES}/gramps-data/thumbnail_cache:/app/thumbnail_cache
- ${DOCKER_VOLUMES}/gramps-data/cache:/app/cache
- ${DOCKER_VOLUMES}/gramps-data/secret:/app/secret
- ${DOCKER_VOLUMES}/gramps-data/db:/root/.gramps/grampsdb
- ${DOCKER_VOLUMES}/gramps-data/media:/app/media
- ${DOCKER_VOLUMES}/gramps-data/tmp:/tmp
labels: labels:
- "traefik.http.routers.gramps.rule=Host(`familytree.lan.ddnsgeek.com`)" - "traefik.http.routers.gramps.rule=Host(`familytree.lan.ddnsgeek.com`)"
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.gramps.entrypoints=websecure" - "traefik.http.routers.gramps.entrypoints=websecure"
- "traefik.http.routers.gramps.tls.certresolver=myresolver" - "traefik.http.routers.gramps.tls.certresolver=myresolver"
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "traefik.http.services.gramps.loadbalancer.server.port=5000" - "traefik.http.services.gramps.loadbalancer.server.port=5000"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "wud.watch=true"
networks: networks:
- traefik - traefik
- gramps - gramps
@@ -65,9 +65,81 @@ services:
retries: 6 retries: 6
start_period: 60s start_period: 60s
grampsweb_celery:
profiles: ["apps","all","gramps"]
image: ghcr.io/gramps-project/grampsweb:latest
container_name: gramps-web-celery
command: celery -A gramps_webapi.celery worker --loglevel=INFO --concurrency=2
depends_on:
- gramps-redis
restart: always
# env_file:
# - ${SECRETS_ENV_FILE}
environment:
TZ: ${TZ}
GRAMPSWEB_TREE: ${GRAMPSWEB_TREE}
GRAMPSWEB_BASE_URL: ${GRAMPSWEB_BASE_URL}
GRAMPSWEB_SECRET_KEY: ${GRAMPSWEB_SECRET_KEY}
GRAMPSWEB_REGISTRATION_DISABLED: ${GRAMPSWEB_REGISTRATION_DISABLED}
GRAMPSWEB_EMAIL_HOST: ${GRAMPSWEB_EMAIL_HOST}
GRAMPSWEB_EMAIL_PORT: ${GRAMPSWEB_EMAIL_PORT}
GRAMPSWEB_EMAIL_HOST_USER: ${GRAMPSWEB_EMAIL_HOST_USER}
GRAMPSWEB_EMAIL_HOST_PASSWORD: ${GRAMPSWEB_EMAIL_HOST_PASSWORD}
GRAMPSWEB_EMAIL_USE_SSL: ${GRAMPSWEB_EMAIL_USE_SSL}
GRAMPSWEB_EMAIL_USE_STARTTLS: ${GRAMPSWEB_EMAIL_USE_STARTTLS}
GRAMPSWEB_DEFAULT_FROM_EMAIL: ${GRAMPSWEB_DEFAULT_FROM_EMAIL}
GRAMPSWEB_CELERY_CONFIG__broker_url: redis://gramps-redis:6379/0
GRAMPSWEB_CELERY_CONFIG__result_backend: redis://gramps-redis:6379/0
GRAMPSWEB_RATELIMIT_STORAGE_URI: redis://gramps-redis:6379/1
volumes:
# - ${PROJECT_ROOT}/apps/gramps/data/users:/app/users
# - ${PROJECT_ROOT}/apps/gramps/data/index:/app/indexdir
# - ${PROJECT_ROOT}/apps/gramps/data/thumbnail_cache:/app/thumbnail_cache
# - ${PROJECT_ROOT}/apps/gramps/data/cache:/app/cache
# - ${PROJECT_ROOT}/apps/gramps/data/secret:/app/secret
# - ${PROJECT_ROOT}/apps/gramps/data/db:/root/.gramps/grampsdb
# - ${PROJECT_ROOT}/apps/gramps/data/media:/app/media
# - ${PROJECT_ROOT}/apps/gramps/data/tmp:/tmp
- ${DOCKER_VOLUMES}/gramps-data/users:/app/users
- ${DOCKER_VOLUMES}/gramps-data/index:/app/indexdir
- ${DOCKER_VOLUMES}/gramps-data/thumbnail_cache:/app/thumbnail_cache
- ${DOCKER_VOLUMES}/gramps-data/cache:/app/cache
- ${DOCKER_VOLUMES}/gramps-data/secret:/app/secret
- ${DOCKER_VOLUMES}/gramps-data/db:/root/.gramps/grampsdb
- ${DOCKER_VOLUMES}/gramps-data/media:/app/media
- ${DOCKER_VOLUMES}/gramps-data/tmp:/tmp
labels:
- "wud.watch=true"
networks:
- gramps
healthcheck:
test:
- CMD-SHELL
- pgrep -f "celery.*gramps_webapi.celery.*worker" >/dev/null
interval: 30s
timeout: 5s
retries: 6
start_period: 60s
gramps-redis:
profiles: ["apps","all","gramps"]
image: valkey/valkey:9-trixie
container_name: gramps-redis
restart: always
networks:
- gramps
healthcheck:
test:
- CMD-SHELL
- valkey-cli -h 127.0.0.1 -p 6379 ping | grep -q PONG
interval: 10s
timeout: 5s
retries: 6
start_period: 10s
labels:
- "wud.watch=true"
networks: networks:
gramps: gramps:
secrets:
gramps_db_password:
file: ${PROJECT_ROOT}/secrets/gramps_db_password.txt
-14
View File
@@ -1,19 +1,5 @@
FROM nextcloud:production FROM nextcloud:production
#RUN groupadd -r doods && useradd -m -s /bin/bash -d /opt/doods -g doods doods
#RUN chsh -s /usr/sbin/nologin root
#RUN chown -R doods:doods /opt/doods
#ENV PATH "${PATH}:/opt/doods"
#ENV HOME /opt/doods
#USER root
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y ffmpeg && \ apt-get install -y ffmpeg && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
#USER www-data
+30 -14
View File
@@ -1,6 +1,7 @@
services: services:
nextcloud-webapp: nextcloud-webapp:
profiles: ["apps","all","nextcloud"] profiles: ["apps","all","nextcloud"]
image: nextcloud:production
build: build:
context: ${PROJECT_ROOT}/apps/nextcloud context: ${PROJECT_ROOT}/apps/nextcloud
container_name: nextcloud-webapp container_name: nextcloud-webapp
@@ -9,10 +10,15 @@ services:
# env_file: # env_file:
# - ${SECRETS_ENV_FILE} # - ${SECRETS_ENV_FILE}
volumes: volumes:
- ${PROJECT_ROOT}/apps/nextcloud/data:/var/www/html/data:rw # - ${PROJECT_ROOT}/apps/nextcloud/data:/var/www/html/data:rw
- ${PROJECT_ROOT}/apps/nextcloud/config:/var/www/html/config:rw - ${NEXTCLOUD_DATA}:/var/www/html/data:rw
# - ${PROJECT_ROOT}/apps/nextcloud/config:/var/www/html/config:rw
- ${DOCKER_VOLUMES}/nextcloud/config:/var/www/html/config:rw
- type: tmpfs - type: tmpfs
target: /tmp:exec target: /tmp:exec
# - ${PROJECT_ROOT}/apps/nextcloud/entrypoint.sh:/entrypoint.sh
# - ${PROJECT_ROOT}/apps/nextcloud/custom_apps:/var/www/html/custom_apps
- ${DOCKER_VOLUMES}/nextcloud/custom_apps:/var/www/html/custom_apps
depends_on: depends_on:
- nextcloud-db - nextcloud-db
- nextcloud-redis - nextcloud-redis
@@ -34,11 +40,11 @@ services:
- SMTP_PASSWORD_FILE=/run/secrets/nextcloud_smtp_password - SMTP_PASSWORD_FILE=/run/secrets/nextcloud_smtp_password
- REDIS_HOST=${NEXTCLOUD_REDIS_HOST} - REDIS_HOST=${NEXTCLOUD_REDIS_HOST}
- REDIS_HOST_PORT=${NEXTCLOUD_REDIS_HOST_PORT} - REDIS_HOST_PORT=${NEXTCLOUD_REDIS_HOST_PORT}
- REDIS_HOST_PASSWORD_FILE=/run/secrets/nextcloud_redis_password # - REDIS_HOST_PASSWORD_FILE=/run/secrets/nextcloud_redis_password
secrets: secrets:
- nextcloud_db_password - nextcloud_db_password
- nextcloud_smtp_password - nextcloud_smtp_password
- nextcloud_redis_password # - nextcloud_redis_password
networks: networks:
- traefik - traefik
- nextcloud - nextcloud
@@ -57,6 +63,7 @@ services:
- "traefik.http.middlewares.nextcloud-webfinger.redirectregex.regex=https://(.*)/.well-known/webfinger" - "traefik.http.middlewares.nextcloud-webfinger.redirectregex.regex=https://(.*)/.well-known/webfinger"
- "traefik.http.middlewares.nextcloud-webfinger.redirectregex.replacement=https://$${1}/nextcloud/index.php/.well-known/webfinger" - "traefik.http.middlewares.nextcloud-webfinger.redirectregex.replacement=https://$${1}/nextcloud/index.php/.well-known/webfinger"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "wud.watch=true"
healthcheck: healthcheck:
test: test:
- CMD-SHELL - CMD-SHELL
@@ -71,16 +78,17 @@ services:
start_period: 180s start_period: 180s
nextcloud-db: nextcloud-db:
image: mariadb:11.4 image: mariadb:${NEXTCLOUD_DB_VERSION}
restart: always restart: always
profiles: ["apps","all","nextcloud"] profiles: ["apps","all","nextcloud"]
container_name: nextcloud-db container_name: nextcloud-db
hostname: nextcloud_db hostname: nextcloud_db
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --log_bin_trust_function_creators=true
# env_file: # env_file:
# - ${PROJECT_ROOT}/secrets/stack-secrets.env # - ${PROJECT_ROOT}/secrets/stack-secrets.env
volumes: volumes:
- ${PROJECT_ROOT}/apps/nextcloud/database:/var/lib/mysql:rw # - ${PROJECT_ROOT}/apps/nextcloud/database:/var/lib/mysql:rw
- ${DOCKER_DATABASES}/nextcloud/mysql:/var/lib/mysql:rw
environment: environment:
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/nextcloud_db_root_password - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/nextcloud_db_root_password
- MYSQL_PASSWORD_FILE=/run/secrets/nextcloud_db_password - MYSQL_PASSWORD_FILE=/run/secrets/nextcloud_db_password
@@ -97,6 +105,9 @@ services:
- nextcloud - nextcloud
labels: labels:
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "wud.watch=true"
- 'wud.tag.include=^11\.4(?:\.\d+)?$'
# - "wud.tag.exclude=${NEXTCLOUD_DB_VERSION}-*"
healthcheck: healthcheck:
test: ["CMD-SHELL", "mariadb-admin ping -u $$MYSQL_USER --password=$$(cat /run/secrets/nextcloud_db_password) --silent"] test: ["CMD-SHELL", "mariadb-admin ping -u $$MYSQL_USER --password=$$(cat /run/secrets/nextcloud_db_password) --silent"]
interval: 10s interval: 10s
@@ -104,23 +115,28 @@ services:
retries: 12 retries: 12
start_period: 60s start_period: 60s
nextcloud-redis: nextcloud-redis:
image: "redis" image: "redis"
profiles: ["apps","all","nextcloud"] profiles: ["apps","all","nextcloud"]
command: ["sh", "-c", "redis-server --requirepass \"$$(cat /run/secrets/nextcloud_redis_password)\" --appendonly yes --save 60 1000"] # command: ["sh", "-c", "redis-server --requirepass \"$$(cat /run/secrets/nextcloud_redis_password)\" --appendonly yes --save 60 1000"]
command: ["sh", "-c", "redis-server --appendonly yes --save 60 1000"]
hostname: redis hostname: redis
container_name: nextcloud-redis container_name: nextcloud-redis
secrets: # secrets:
- nextcloud_redis_password # - nextcloud_redis_password
volumes: volumes:
- ${PROJECT_ROOT}/apps/nextcloud/data/redis:/data:rw # - ${PROJECT_ROOT}/apps/nextcloud/data/redis:/data:rw
- ${DOCKER_DATABASES}/nextcloud/redis:/data:rw
restart: always restart: always
networks: networks:
- nextcloud - nextcloud
labels: labels:
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "wud.watch=true"
healthcheck: healthcheck:
test: ["CMD-SHELL", "redis-cli -a \"$$(cat /run/secrets/nextcloud_redis_password)\" PING | grep -q PONG"] # test: ["CMD-SHELL", "redis-cli -a \"$$(cat /run/secrets/nextcloud_redis_password)\" PING | grep -q PONG"]
test: ["CMD-SHELL", "redis-cli PING | grep -q PONG"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 6 retries: 6
@@ -138,5 +154,5 @@ secrets:
file: ${PROJECT_ROOT}/secrets/nextcloud_admin_password.txt file: ${PROJECT_ROOT}/secrets/nextcloud_admin_password.txt
nextcloud_smtp_password: nextcloud_smtp_password:
file: ${PROJECT_ROOT}/secrets/nextcloud_smtp_password.txt file: ${PROJECT_ROOT}/secrets/nextcloud_smtp_password.txt
nextcloud_redis_password: # nextcloud_redis_password:
file: ${PROJECT_ROOT}/secrets/nextcloud_redis_password.txt # file: ${PROJECT_ROOT}/secrets/nextcloud_redis_password.txt
+13
View File
@@ -0,0 +1,13 @@
#!/bin/bash
set -e
OCC="/var/www/html/occ"
php $OCC app:install memories || true
php $OCC app:enable memories || true
php $OCC app:install recognize || true
php $OCC app:enable recognize || true
exec apache2-foreground
+12 -5
View File
@@ -2,7 +2,7 @@ services:
passbolt-db: passbolt-db:
profiles: ["apps","all","passbolt"] profiles: ["apps","all","passbolt"]
container_name: passbolt-db container_name: passbolt-db
image: mariadb:12 image: mariadb:latest
restart: always restart: always
# env_file: # env_file:
# - ${PROJECT_ROOT}/secrets/stack-secrets.env # - ${PROJECT_ROOT}/secrets/stack-secrets.env
@@ -14,7 +14,8 @@ services:
secrets: secrets:
- passbolt_db_password - passbolt_db_password
volumes: volumes:
- ${PROJECT_ROOT}/apps/passbolt/data/database:/var/lib/mysql # - ${PROJECT_ROOT}/apps/passbolt/data/database:/var/lib/mysql
- ${DOCKER_DATABASES}/passbolt:/var/lib/mysql
networks: networks:
- passbolt - passbolt
healthcheck: healthcheck:
@@ -24,7 +25,8 @@ services:
retries: 12 retries: 12
start_period: 60s start_period: 60s
labels: labels:
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "wud.watch=true"
passbolt-webapp: passbolt-webapp:
image: passbolt/passbolt:latest-ce image: passbolt/passbolt:latest-ce
@@ -45,8 +47,12 @@ services:
secrets: secrets:
- passbolt_db_password - passbolt_db_password
volumes: volumes:
- ${PROJECT_ROOT}/apps/passbolt/data/gpg:/etc/passbolt/gpg # - ${PROJECT_ROOT}/apps/passbolt/data/gpg:/etc/passbolt/gpg
- ${PROJECT_ROOT}/apps/passbolt/data/jwt:/etc/passbolt/jwt # - ${PROJECT_ROOT}/apps/passbolt/data/jwt:/etc/passbolt/jwt
- ${DOCKER_VOLUMES}/passbolt-data/gpg:/etc/passbolt/gpg
- ${DOCKER_VOLUMES}/passbolt-data/jwt:/etc/passbolt/jwt
command: command:
[ [
"/usr/bin/wait-for.sh", "/usr/bin/wait-for.sh",
@@ -66,6 +72,7 @@ services:
- "traefik.http.routers.passbolt.tls.certresolver=myresolver" - "traefik.http.routers.passbolt.tls.certresolver=myresolver"
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "wud.watch=true"
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl -fsS http://localhost/healthcheck/status | grep -qx OK"] test: ["CMD-SHELL", "curl -fsS http://localhost/healthcheck/status | grep -qx OK"]
interval: 30s interval: 30s
+7 -6
View File
@@ -13,13 +13,14 @@ services:
networks: networks:
- traefik - traefik
labels: labels:
- "traefik.http.routers.searxng.rule=Host(`searxng.lan.ddnsgeek.com`)" - "traefik.http.routers.searxng.rule=Host(`searxng.lan.ddnsgeek.com`)"
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.searxng.entrypoints=websecure" - "traefik.http.routers.searxng.entrypoints=websecure"
- "traefik.http.routers.searxng.tls.certresolver=myresolver" - "traefik.http.routers.searxng.tls.certresolver=myresolver"
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
# - "traefik.http.routers.searxng.middlewares=crowdsec@file,secHeaders@file,error-pages-middleware" # - "traefik.http.routers.searxng.middlewares=crowdsec@file,secHeaders@file,error-pages-middleware"
- "traefik.http.services.searxng.loadbalancer.server.port=8080" - "traefik.http.services.searxng.loadbalancer.server.port=8080"
- "wud.watch=true"
healthcheck: healthcheck:
test: ["CMD-SHELL", "python3 -c \"import urllib.request,sys; r=urllib.request.urlopen('http://127.0.0.1:8080/', timeout=3); sys.exit(0 if 200<=r.status<400 else 1)\""] test: ["CMD-SHELL", "python3 -c \"import urllib.request,sys; r=urllib.request.urlopen('http://127.0.0.1:8080/', timeout=3); sys.exit(0 if 200<=r.status<400 else 1)\""]
interval: 20s interval: 20s
@@ -16,7 +16,8 @@ services:
volumes: volumes:
- ~/.docker/config.json:/root/.docker/config.json:ro - ~/.docker/config.json:/root/.docker/config.json:ro
- ${PROJECT_ROOT}/monitoring/docker-exporter/data:/data:rw # - ${PROJECT_ROOT}/monitoring/docker-exporter/data:/data:rw
- ${DOCKER_VOLUMES}/docker-update-exporter-data:/data:rw
- ${PROJECT_ROOT}:/compose:ro - ${PROJECT_ROOT}:/compose:ro
# - ${PROJECT_ROOT}/default-environment.env:/compose/default-environment.env:ro # - ${PROJECT_ROOT}/default-environment.env:/compose/default-environment.env:ro
# - ${PROJECT_ROOT}/default-network.yml:/compose/default-network.yml:ro # - ${PROJECT_ROOT}/default-network.yml:/compose/default-network.yml:ro
@@ -53,3 +54,6 @@ services:
timeout: 5s timeout: 5s
retries: 3 retries: 3
start_period: 10s start_period: 10s
#volumes:
# docker-update-exporter-data:
# external: true
@@ -7,7 +7,8 @@ services:
environment: environment:
- GF_SERVER_ROOT_URL=${GRAFANA_ROOT_URL} - GF_SERVER_ROOT_URL=${GRAFANA_ROOT_URL}
volumes: volumes:
- ${PROJECT_ROOT}/monitoring/grafana/data:/var/lib/grafana # - ${PROJECT_ROOT}/monitoring/grafana/data:/var/lib/grafana
- ${DOCKER_VOLUMES}/grafana-data:/var/lib/grafana
networks: networks:
# - traefik_reverse_proxy # - traefik_reverse_proxy
# - prometheus_edge # - prometheus_edge
@@ -48,3 +49,7 @@ services:
# external: true # external: true
# prometheus_edge: # prometheus_edge:
# external: true # external: true
#volumes:
# grafana-data:
# external: true
@@ -1,13 +1,14 @@
services: services:
influxdb: influxdb:
profiles: ["monitoring","all","influxdb", "prometheus"] profiles: ["monitoring","all","influxdb", "prometheus"]
image: influxdb:2.7 image: influxdb:2
container_name: influxdb container_name: influxdb
restart: unless-stopped restart: unless-stopped
# env_file: # env_file:
# - ${PROJECT_ROOT}/secrets/stack-secrets.env # - ${PROJECT_ROOT}/secrets/stack-secrets.env
volumes: volumes:
- ${PROJECT_ROOT}/monitoring/influxdb:/var/lib/influxdb2 # - ${PROJECT_ROOT}/monitoring/influxdb:/var/lib/influxdb2
- ${DOCKER_DATABASES}/influxdb-data:/var/lib/influxdb2
environment: environment:
DOCKER_INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE} DOCKER_INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE}
DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_INIT_USERNAME} DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_INIT_USERNAME}
@@ -21,6 +22,8 @@ services:
# - traefik_reverse_proxy # - traefik_reverse_proxy
- traefik - traefik
- monitor - monitor
ports:
- 8086:8086
labels: labels:
- "traefik.http.routers.influxdb.rule=Host(`influxdb.lan.ddnsgeek.com`)" - "traefik.http.routers.influxdb.rule=Host(`influxdb.lan.ddnsgeek.com`)"
- "traefik.enable=true" - "traefik.enable=true"
@@ -41,3 +44,7 @@ services:
secrets: secrets:
influxdb_init_password: influxdb_init_password:
file: ${PROJECT_ROOT}/secrets/influxdb_init_password.txt file: ${PROJECT_ROOT}/secrets/influxdb_init_password.txt
#volumes:
# influxdb-data:
# external: true
@@ -0,0 +1,60 @@
# mTLS Bridge Service
Internal HTTP-to-mTLS bridge for services that cannot present client certificates directly (for example, Grafana webhooks).
## How it works
1. Accepts plain HTTP requests inside the Docker network.
2. Forwards requests to an upstream base URL.
3. Preserves the incoming request path/method/body/query string.
4. Presents a client certificate/key pair for mTLS authentication.
## Environment variables
- `TARGET_URL` (required): upstream base URL (for example `http://node-red:1880`).
- `CLIENT_CERT` (default `/certs/client.crt`): client certificate path.
- `CLIENT_KEY` (default `/certs/client.key`): client private key path.
- `UPSTREAM_CA_CERT` (optional, alias: `CA_CERT`): CA bundle path to verify upstream TLS. Use `false`/`0`/`no` to disable verification.
- `TIMEOUT` (default `5`): request timeout in seconds.
- `LOG_LEVEL` (default `INFO`): Python logging level.
- `HEALTH_ENDPOINT` (default `/_mtls_bridge/health`): local container health endpoint path.
- `ALLOWED_PATHS_FILE` (optional): file path containing one allowed endpoint path per line (for example `/health`). Blank lines and `#` comments are ignored. If unset, all paths are allowed.
- `MTLS_BRIDGE_BASIC_AUTH_USERS` (required for Traefik auth): value for `traefik.http.middlewares.*.basicauth.users` (e.g. `user:$$apr1$$...`).
- `MTLS_BRIDGE_CORS_ALLOW_ORIGIN` (default `https://grafana.lan.ddnsgeek.com`): origin allowed for browser-based panel actions.
## Endpoints
- `GET /_mtls_bridge/health` returns `200 OK` for container health checks.
- `/*` proxies requests to `${TARGET_URL}/*` with method/body/headers/query string preserved (subject to optional allow-list checks).
Examples with `TARGET_URL=http://node-red:1880`:
- `https://mtls-bridge.../docker-update-lockouts/clear` -> `http://node-red:1880/docker-update-lockouts/clear`
- `https://mtls-bridge.../health` -> `http://node-red:1880/health`
- `https://mtls-bridge.../uptime-kuma` -> `http://node-red:1880/uptime-kuma`
## Compose integration
This repository includes `monitoring/mtls-bridge/docker-compose.yml`:
- No public port exposure.
- Read-only cert mount (`${PROJECT_ROOT}/core/traefik/certs:/certs:ro`).
- Joined to internal monitoring/traefik networks.
## Example test
```bash
curl http://mtls-bridge:8080/_mtls_bridge/health
curl -X POST http://mtls-bridge:8080/docker-update-lockouts/clear
```
## Allow-list file example
```text
# one path per line
/docker-update-lockouts/clear
/health
/uptime-kuma
```
When `ALLOWED_PATHS_FILE` is set, any path not listed returns `403 Endpoint not allowed`.
@@ -1,6 +1,7 @@
import logging import logging
import os import os
import time import time
from urllib.parse import urljoin
import requests import requests
from flask import Flask, Response, g, request from flask import Flask, Response, g, request
@@ -15,23 +16,39 @@ logger = logging.getLogger("mtls-bridge")
logging.getLogger("werkzeug").setLevel(logging.WARNING) logging.getLogger("werkzeug").setLevel(logging.WARNING)
# Config via env # Config via env
TARGET_URL = os.environ.get("TARGET_URL") TARGET_URL = (os.environ.get("TARGET_URL") or "").strip()
CLIENT_CERT = os.environ.get("CLIENT_CERT", "/certs/client.crt") CLIENT_CERT = os.environ.get("CLIENT_CERT", "/certs/client.crt")
CLIENT_KEY = os.environ.get("CLIENT_KEY", "/certs/client.key") CLIENT_KEY = os.environ.get("CLIENT_KEY", "/certs/client.key")
UPSTREAM_CA_CERT = os.environ.get("UPSTREAM_CA_CERT", os.environ.get("CA_CERT", "")).strip() UPSTREAM_CA_CERT = os.environ.get("UPSTREAM_CA_CERT", os.environ.get("CA_CERT", "")).strip()
# Backward-compat alias: keep CA_CERT defined so legacy code paths/log statements don't crash.
CA_CERT = UPSTREAM_CA_CERT
TIMEOUT = int(os.environ.get("TIMEOUT", "5")) TIMEOUT = int(os.environ.get("TIMEOUT", "5"))
HEALTH_ENDPOINT = os.environ.get("HEALTH_ENDPOINT", "/_mtls_bridge/health")
ALLOWED_PATHS_FILE = (os.environ.get("ALLOWED_PATHS_FILE") or "").strip()
logger.info(
"mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s ca=%s log_level=%s", def normalize_path(path: str) -> str:
TARGET_URL, if not path or path == "/":
TIMEOUT, return "/"
CLIENT_CERT, return f"/{path.lstrip('/')}"
CLIENT_KEY,
CA_CERT,
os.environ.get("LOG_LEVEL", "INFO"), def load_allowed_paths() -> set[str]:
) if not ALLOWED_PATHS_FILE:
return set()
if not os.path.exists(ALLOWED_PATHS_FILE):
logger.warning("ALLOWED_PATHS_FILE does not exist: %s (allow-list disabled)", ALLOWED_PATHS_FILE)
return set()
allowed_paths = set()
with open(ALLOWED_PATHS_FILE, encoding="utf-8") as f:
for line in f:
entry = line.strip()
if not entry or entry.startswith("#"):
continue
allowed_paths.add(normalize_path(entry))
logger.info("loaded %s allowed path(s) from %s", len(allowed_paths), ALLOWED_PATHS_FILE)
return allowed_paths
def get_verify_setting(): def get_verify_setting():
@@ -54,95 +71,47 @@ def get_verify_setting():
VERIFY_SETTING = get_verify_setting() VERIFY_SETTING = get_verify_setting()
ALLOWED_PATHS = load_allowed_paths()
logger.info(
"mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s verify=%s log_level=%s",
TARGET_URL,
TIMEOUT,
CLIENT_CERT,
CLIENT_KEY,
VERIFY_SETTING,
os.environ.get("LOG_LEVEL", "INFO"),
)
def get_verify_setting():
if not UPSTREAM_CA_CERT:
return True
lowered = UPSTREAM_CA_CERT.lower()
if lowered in {"false", "0", "no"}:
logger.warning("TLS verification for upstream is disabled via UPSTREAM_CA_CERT=%s", UPSTREAM_CA_CERT)
return False
if not os.path.exists(UPSTREAM_CA_CERT):
logger.warning(
"Configured UPSTREAM_CA_CERT path does not exist: %s (falling back to system CA bundle)",
UPSTREAM_CA_CERT,
)
return True
return UPSTREAM_CA_CERT
VERIFY_SETTING = get_verify_setting()
logger.info(
"mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s verify=%s log_level=%s",
TARGET_URL,
TIMEOUT,
CLIENT_CERT,
CLIENT_KEY,
VERIFY_SETTING,
os.environ.get("LOG_LEVEL", "INFO"),
)
if TARGET_URL and TARGET_URL.lower().startswith("http://"): if TARGET_URL and TARGET_URL.lower().startswith("http://"):
logger.warning( logger.warning("TARGET_URL uses http:// (plaintext): %s", TARGET_URL)
"TARGET_URL uses http://; upstream may redirect to https:// and change request behavior: %s",
TARGET_URL,
)
def get_verify_setting():
if not UPSTREAM_CA_CERT:
return True
lowered = UPSTREAM_CA_CERT.lower()
if lowered in {"false", "0", "no"}:
logger.warning("TLS verification for upstream is disabled via UPSTREAM_CA_CERT=%s", UPSTREAM_CA_CERT)
return False
if not os.path.exists(UPSTREAM_CA_CERT):
logger.warning(
"Configured UPSTREAM_CA_CERT path does not exist: %s (falling back to system CA bundle)",
UPSTREAM_CA_CERT,
)
return True
return UPSTREAM_CA_CERT
VERIFY_SETTING = get_verify_setting()
logger.info( logger.info(
"mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s verify=%s log_level=%s", "mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s verify=%s health_endpoint=%s allow_list_file=%s allow_list_entries=%s log_level=%s",
TARGET_URL, TARGET_URL,
TIMEOUT, TIMEOUT,
CLIENT_CERT, CLIENT_CERT,
CLIENT_KEY, CLIENT_KEY,
VERIFY_SETTING, VERIFY_SETTING,
HEALTH_ENDPOINT,
ALLOWED_PATHS_FILE,
len(ALLOWED_PATHS),
os.environ.get("LOG_LEVEL", "INFO"), os.environ.get("LOG_LEVEL", "INFO"),
) )
if TARGET_URL and TARGET_URL.lower().startswith("http://"):
logger.warning( def build_upstream_url(path: str) -> str:
"TARGET_URL uses http://; upstream may redirect to https:// and change request behavior: %s", """Map incoming path directly onto TARGET_URL origin/base path."""
TARGET_URL, if not TARGET_URL:
) raise ValueError("TARGET_URL is not set")
normalized_target = TARGET_URL.rstrip("/") + "/"
normalized_path = path.lstrip("/")
upstream_url = urljoin(normalized_target, normalized_path)
if request.query_string:
upstream_url = f"{upstream_url}?{request.query_string.decode('utf-8', 'ignore')}"
return upstream_url
@app.route("/health", methods=["GET"]) def is_path_allowed(request_path: str) -> bool:
if not ALLOWED_PATHS:
return True
return request_path in ALLOWED_PATHS
@app.route(HEALTH_ENDPOINT, methods=["GET"])
def health(): def health():
logger.debug("healthcheck request from %s", request.remote_addr) logger.debug("healthcheck request from %s", request.remote_addr)
return "OK", 200 return "OK", 200
@@ -156,7 +125,7 @@ def before_request():
@app.after_request @app.after_request
def after_request(response): def after_request(response):
elapsed_ms = int((time.time() - g.request_start) * 1000) elapsed_ms = int((time.time() - g.request_start) * 1000)
if request.path != "/health": if request.path != HEALTH_ENDPOINT:
logger.info( logger.info(
"request complete method=%s path=%s status=%s elapsed_ms=%s", "request complete method=%s path=%s status=%s elapsed_ms=%s",
request.method, request.method,
@@ -179,7 +148,7 @@ def after_request(response):
provide_automatic_options=False, provide_automatic_options=False,
) )
def proxy(path): def proxy(path):
request_path = f"/{path}" if path else "/" request_path = normalize_path(path)
request_size = len(request.get_data(cache=True)) request_size = len(request.get_data(cache=True))
logger.info( logger.info(
"incoming request method=%s path=%s query=%s remote=%s bytes=%s", "incoming request method=%s path=%s query=%s remote=%s bytes=%s",
@@ -190,50 +159,49 @@ def proxy(path):
request_size, request_size,
) )
if not TARGET_URL: if not is_path_allowed(request_path):
logger.error("TARGET_URL is not set; cannot proxy request") logger.warning("request blocked by allow-list path=%s", request_path)
return Response("TARGET_URL is not set", status=500) return Response("Endpoint not allowed", status=403)
try: try:
url = f"{TARGET_URL.rstrip('/')}/{path}".rstrip("/") upstream_url = build_upstream_url(path)
start_time = time.time()
headers = {k: v for k, v in request.headers if k.lower() != "host"} headers = {k: v for k, v in request.headers if k.lower() != "host"}
headers["X-Forwarded-By"] = "mtls-bridge" headers["X-Forwarded-By"] = "mtls-bridge"
logger.debug("forwarding request to upstream url=%s headers=%s", url, headers) start_time = time.time()
resp = requests.request( resp = requests.request(
method=request.method, method=request.method,
url=url, url=upstream_url,
headers=headers, headers=headers,
data=request.get_data(cache=True), data=request.get_data(cache=True),
cookies=request.cookies, cookies=request.cookies,
cert=(CLIENT_CERT, CLIENT_KEY), cert=(CLIENT_CERT, CLIENT_KEY),
verify=VERIFY_SETTING, verify=VERIFY_SETTING,
timeout=TIMEOUT, timeout=TIMEOUT,
allow_redirects=False,
) )
elapsed_ms = int((time.time() - start_time) * 1000) elapsed_ms = int((time.time() - start_time) * 1000)
logger.info( logger.info(
"upstream response status=%s url=%s elapsed_ms=%s response_bytes=%s", "upstream response status=%s url=%s elapsed_ms=%s response_bytes=%s",
resp.status_code, resp.status_code,
url, upstream_url,
elapsed_ms, elapsed_ms,
len(resp.content), len(resp.content),
) )
excluded_headers = ["content-encoding", "content-length", "transfer-encoding", "connection"] excluded_headers = {"content-encoding", "content-length", "transfer-encoding", "connection"}
response_headers = [ response_headers = [(k, v) for k, v in resp.headers.items() if k.lower() not in excluded_headers]
(k, v)
for k, v in resp.raw.headers.items()
if k.lower() not in excluded_headers
]
return Response(resp.content, resp.status_code, response_headers) return Response(resp.content, resp.status_code, response_headers)
except Exception as e: except ValueError as exc:
logger.error("proxy request failed: %s", exc)
return Response(str(exc), status=500)
except Exception as exc: # noqa: BLE001
logger.exception("proxy request failed") logger.exception("proxy request failed")
return Response(str(e), status=500) return Response(str(exc), status=500)
if __name__ == "__main__": if __name__ == "__main__":
@@ -0,0 +1,49 @@
services:
mtls-bridge:
profiles: ["monitoring", "all", "mtls-bridge"]
build:
context: ${PROJECT_ROOT}/monitoring/mtls-bridge
container_name: mtls-bridge
hostname: mtls-bridge.lan.ddnsgeek.com
restart: unless-stopped
environment:
- TARGET_URL=${MTLS_BRIDGE_TARGET_URL}
- CLIENT_CERT=${MTLS_BRIDGE_CLIENT_CERT}
- CLIENT_KEY=${MTLS_BRIDGE_CLIENT_KEY}
- TIMEOUT=${MTLS_BRIDGE_TIMEOUT}
- LOG_LEVEL=${MTLS_BRIDGE_LOG_LEVEL:-INFO}
- UPSTREAM_CA_CERT=${MTLS_BRIDGE_UPSTREAM_CA_CERT:-}
- ALLOWED_PATHS_FILE=${MTLS_BRIDGE_ALLOWED_PATHS_FILE:-}
volumes:
- ${PROJECT_ROOT}/core/traefik/certs:/certs:ro
labels:
- "traefik.http.routers.mtls-bridge.rule=Host(`mtls-bridge.lan.ddnsgeek.com`)"
- "traefik.enable=true"
- "traefik.http.routers.mtls-bridge.entrypoints=websecure"
- "traefik.http.routers.mtls-bridge.tls.certresolver=myresolver"
- "traefik.http.routers.mtls-bridge.middlewares=mtls-bridge-auth,mtls-bridge-cors"
- "traefik.http.middlewares.mtls-bridge-auth.basicauth.users=${MTLS_BRIDGE_BASIC_AUTH_USERS}"
- "traefik.http.routers.mtls-bridge-preflight.rule=Host(`mtls-bridge.lan.ddnsgeek.com`) && Method(`OPTIONS`)"
- "traefik.http.routers.mtls-bridge-preflight.entrypoints=websecure"
- "traefik.http.routers.mtls-bridge-preflight.tls.certresolver=myresolver"
- "traefik.http.routers.mtls-bridge-preflight.middlewares=mtls-bridge-cors"
- "traefik.http.routers.mtls-bridge-preflight.priority=100"
- "traefik.http.routers.mtls-bridge-preflight.service=mtls-bridge"
- "traefik.http.middlewares.mtls-bridge-cors.headers.accesscontrolalloworiginlist=${MTLS_BRIDGE_CORS_ALLOW_ORIGIN}"
- "traefik.http.middlewares.mtls-bridge-cors.headers.accesscontrolallowmethods=GET,POST,PUT,PATCH,DELETE,OPTIONS"
- "traefik.http.middlewares.mtls-bridge-cors.headers.accesscontrolallowheaders=authorization,content-type,x-grafana-action,x-grafana-device-id"
- "traefik.http.middlewares.mtls-bridge-cors.headers.accesscontrolallowcredentials=true"
- "traefik.http.middlewares.mtls-bridge-cors.headers.addvaryheader=true"
- "io.portainer.accesscontrol.public"
# - "traefik.http.routers.searxng.middlewares=crowdsec@file,secHeaders@file,error-pages-middleware"
- "traefik.http.services.mtls-bridge.loadbalancer.server.port=8080"
- "traefik.docker.network=core_traefik"
healthcheck:
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8080/_mtls_bridge/health', timeout=3).read()"]
interval: 30s
timeout: 5s
retries: 3
start_period: 10s
networks:
- monitor
- traefik
@@ -19,7 +19,8 @@ services:
# ports: # ports:
# - "1880:1880" # - "1880:1880"
volumes: volumes:
- ${PROJECT_ROOT}/monitoring/node-red/data:/data # - ${PROJECT_ROOT}/monitoring/node-red/data:/data
- ${DOCKER_VOLUMES}/node-red-data:/data
- ${PROJECT_ROOT}:/compose/docker:ro - ${PROJECT_ROOT}:/compose/docker:ro
- /home/nixos/raspi:/compose/raspi:ro - /home/nixos/raspi:/compose/raspi:ro
# - ${PROJECT_ROOT}:/usr/src/node-red:ro # - ${PROJECT_ROOT}:/usr/src/node-red:ro
@@ -61,3 +62,6 @@ services:
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "traefik.http.services.node-red.loadbalancer.server.port=1880" - "traefik.http.services.node-red.loadbalancer.server.port=1880"
#volumes:
# node-red-data:
# external: true
@@ -20,8 +20,10 @@ services:
# context: ${PROJECT_ROOT}/monitoring/prometheus # context: ${PROJECT_ROOT}/monitoring/prometheus
volumes: volumes:
- ${PROJECT_ROOT}/monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro - ${PROJECT_ROOT}/monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
- ${PROJECT_ROOT}/monitoring/prometheus/data:/prometheus # - ${PROJECT_ROOT}/monitoring/prometheus/data:/prometheus
- ${PROJECT_ROOT}/monitoring/prometheus/rules:/etc/prometheus/rules:ro # - ${PROJECT_ROOT}/monitoring/prometheus/rules:/etc/prometheus/rules:ro
- ${DOCKER_VOLUMES}/prometheus/data:/prometheus
- ${DOCKER_VOLUMES}/prometheus/rules:/etc/prometheus/rules:ro
- ${PROJECT_ROOT}/secrets/prometheus_kuma_basic_auth_password.txt:/run/secrets/prometheus_kuma_basic_auth_password:ro - ${PROJECT_ROOT}/secrets/prometheus_kuma_basic_auth_password.txt:/run/secrets/prometheus_kuma_basic_auth_password:ro
restart: unless-stopped restart: unless-stopped
@@ -46,3 +48,9 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
start_period: 30s start_period: 30s
#volumes:
# prometheus-data:
# external: true
# prometheus-rules:
# external: true
@@ -109,6 +109,11 @@ scrape_configs:
- kuma.lan.ddnsgeek.com - kuma.lan.ddnsgeek.com
labels: labels:
role: raspberrypi role: raspberrypi
tls_config:
# ca_file: /prometheus/clients-ca.crt
cert_file: /prometheus/office-pc.crt
key_file: /prometheus/office-pc.key
# server_name: kuma.lan.ddnsgeek.com
# ========================= # =========================
# Proxmox Storage Exporters # Proxmox Storage Exporters
@@ -122,11 +127,11 @@ scrape_configs:
role: proxmox role: proxmox
storage: lvm storage: lvm
- targets: # - targets:
- pbs.sweet.home:9102 # - pbs.sweet.home:9102
labels: # labels:
role: backup # role: backup
storage: datastore # storage: datastore
# ========================= # =========================
# Docker Updates Exporter # Docker Updates Exporter
@@ -12,7 +12,9 @@ services:
- no-new-privileges:true - no-new-privileges:true
volumes: volumes:
- ${PROJECT_ROOT}/monitoring/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro - ${PROJECT_ROOT}/monitoring/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro
- ${PROJECT_ROOT}/monitoring/node-red/data:/var/log/node-red:ro # - ${PROJECT_ROOT}/monitoring/node-red/data:/var/log/node-red:ro
- ${DOCKER_VOLUMES}/node-red-data:/var/log/node-red:ro
networks: networks:
# - edge # - edge
- monitor - monitor
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3 -1
View File
@@ -3,7 +3,9 @@ server.address: tcp://0.0.0.0:9091
log: log:
level: info level: info
identity_validation.reset_password.jwt_secret: T72Xcxa4d7xpQRypFDZpunlZt0IjqspojmBlxBr69gnkRjzR144YgjZsgFYZK0gS identity_validation:
reset_password:
jwt_secret: T72Xcxa4d7xpQRypFDZpunlZt0IjqspojmBlxBr69gnkRjzR144YgjZsgFYZK0gS
session: session:
secret: BYksO7YUAJ8gXx9Endgpe46RgB10nkeKpD1qcQPt0GuYGQm2pS2zjJtNOrCEqpav secret: BYksO7YUAJ8gXx9Endgpe46RgB10nkeKpD1qcQPt0GuYGQm2pS2zjJtNOrCEqpav
+12 -8
View File
@@ -3,16 +3,19 @@ services:
profiles: ["core","all","authelia", "traefik"] profiles: ["core","all","authelia", "traefik"]
image: authelia/authelia image: authelia/authelia
restart: always restart: always
build: # build:
context: ${PROJECT_ROOT}/core/authelia # context: ${PROJECT_ROOT}/core/authelia
# env_file: env_file:
# - ${PROJECT_ROOT}/secrets/stack-secrets.env - ${PROJECT_ROOT}/secrets/stack-secrets.env
# environment: # environment:
# - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET:${AUTHELIA_JWT_SECRET} # - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=${AUTHELIA_JWT_SECRET}
# - AUTHELIA_SESSION_SECRET:${AUTHELIA_SESSION_SECRET} # - AUTHELIA_SESSION_SECRET=${AUTHELIA_SESSION_SECRET}
# - AUTHELIA_STORAGE_ENCRYPTION_KEY:${AUTHELIA_STORAGE_ENCRYPTION_KEY} # - AUTHELIA_STORAGE_ENCRYPTION_KEY=${AUTHELIA_STORAGE_ENCRYPTION_KEY}
volumes: volumes:
- ${PROJECT_ROOT}/core/authelia:/config # - ${PROJECT_ROOT}/core/authelia:/config
- ${DOCKER_VOLUMES}/authelia-data:/config/data
- ${PROJECT_ROOT}/core/authelia/configuration.yml:/config/configuration.yml:ro
- ${PROJECT_ROOT}/core/authelia/users_database.yml:/config/users_database.yml:ro
networks: networks:
# - reverse_proxy # - reverse_proxy
- traefik - traefik
@@ -28,3 +31,4 @@ services:
- traefik.http.middlewares.authelia.forwardauth.trustForwardHeader=true - traefik.http.middlewares.authelia.forwardauth.trustForwardHeader=true
- traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups - traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups
- traefik.http.middlewares.authelia.forwardauth.maxResponseBodySize=2097152 - traefik.http.middlewares.authelia.forwardauth.maxResponseBodySize=2097152
- "wud.watch=true"
+3 -3
View File
@@ -1,6 +1,6 @@
FROM crowdsecurity/crowdsec:latest FROM crowdsecurity/crowdsec:latest
COPY config/ /etc/crowdsec #COPY config/ /etc/crowdsec
# Install required components at build time # Install required components at build time
RUN cscli hub update && \ #RUN cscli hub update && \
cscli collections install crowdsecurity/traefik --force # cscli collections install crowdsecurity/traefik --force
+13 -5
View File
@@ -1,17 +1,23 @@
services: services:
crowdsec: crowdsec:
profiles: ["core","all","crowdsec", "traefik"] profiles: ["core","all","crowdsec", "traefik"]
# image: crowdsecurity/crowdsec:latest image: crowdsecurity/crowdsec:latest
build: ${PROJECT_ROOT}/core/crowdsec # build: ${PROJECT_ROOT}/core/crowdsec
container_name: crowdsec container_name: crowdsec
restart: always restart: always
environment: environment:
- COLLECTIONS=crowdsecurity/traefik - COLLECTIONS=crowdsecurity/traefik
# - CROWDSEC_LAPI_KEY=${CROWDSEC_LAPI_KEY} # - CROWDSEC_LAPI_KEY=${CROWDSEC_LAPI_KEY}
volumes: volumes:
- ${PROJECT_ROOT}/core/crowdsec/logs:/logs:ro # - ${PROJECT_ROOT}/core/crowdsec/logs:/logs:ro
- ${PROJECT_ROOT}/core/crowdsec/data:/var/lib/crowdsec/data # - ${PROJECT_ROOT}/core/crowdsec/data:/var/lib/crowdsec/data
- ${PROJECT_ROOT}/core/crowdsec/config:/etc/crowdsec # - ${PROJECT_ROOT}/core/crowdsec/config:/etc/crowdsec
- ${DOCKER_VOLUMES}/crowdsec/logs:/logs:ro
- ${DOCKER_VOLUMES}/crowdsec/data:/var/lib/crowdsec/data
# - ${DOCKER_VOLUMES}/crowdsec/config.yaml:/etc/crowdsec/config.yaml
# - ${DOCKER_VOLUMES}/crowdsec/config:/etc/crowdsec
- ${PROJECT_ROOT}/core/crowdsec/acquis.d:/etc/crowdsec/acquis.d
- ${PROJECT_ROOT}/core/crowdsec/profiles.yaml:/etc/crowdsec/profiles.yaml
networks: networks:
# - reverse_proxy # - reverse_proxy
- traefik - traefik
@@ -21,3 +27,5 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
start_period: 15s start_period: 15s
labels:
- "wud.watch=true"
+29
View File
@@ -0,0 +1,29 @@
name: default_ip_remediation
#debug: true
filters:
- Alert.Remediation == true && Alert.GetScope() == "Ip"
decisions:
- type: ban
duration: 4h
#duration_expr: Sprintf('%dh', (GetDecisionsCount(Alert.GetValue()) + 1) * 4)
# notifications:
# - slack_default # Set the webhook in /etc/crowdsec/notifications/slack.yaml before enabling this.
# - splunk_default # Set the splunk url and token in /etc/crowdsec/notifications/splunk.yaml before enabling this.
# - http_default # Set the required http parameters in /etc/crowdsec/notifications/http.yaml before enabling this.
# - email_default # Set the required email parameters in /etc/crowdsec/notifications/email.yaml before enabling this.
on_success: break
---
name: default_range_remediation
#debug: true
filters:
- Alert.Remediation == true && Alert.GetScope() == "Range"
decisions:
- type: ban
duration: 4h
#duration_expr: Sprintf('%dh', (GetDecisionsCount(Alert.GetValue()) + 1) * 4)
# notifications:
# - slack_default # Set the webhook in /etc/crowdsec/notifications/slack.yaml before enabling this.
# - splunk_default # Set the splunk url and token in /etc/crowdsec/notifications/splunk.yaml before enabling this.
# - http_default # Set the required http parameters in /etc/crowdsec/notifications/http.yaml before enabling this.
# - email_default # Set the required email parameters in /etc/crowdsec/notifications/email.yaml before enabling this.
on_success: break
@@ -1,6 +1,6 @@
services: services:
docker-socket-proxy: docker-socket-proxy:
profiles: ["monitoring","all","docker-socket-proxy", "core", "traefik", "prometheus", "test"] profiles: ["monitoring","all","docker-socket-proxy", "core", "traefik", "uptime-kuma", "beszel", "wud", "apps"]
image: tecnativa/docker-socket-proxy:latest image: tecnativa/docker-socket-proxy:latest
container_name: docker-socket-proxy container_name: docker-socket-proxy
hostname: docker-socket-proxy hostname: docker-socket-proxy
@@ -43,5 +43,10 @@ services:
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
networks: networks:
- monitor # - monitor
- traefik - traefik
- docker-socket-proxy
ports:
- 2375:2375
labels:
- "wud.watch=true"
+3 -2
View File
@@ -1,7 +1,7 @@
services: services:
error-pages: error-pages:
profiles: ["core","all","error-pages", "traefik"] profiles: ["core","all","error-pages", "traefik"]
image: tarampampam/error-pages:3 image: tarampampam/error-pages:latest
restart: always restart: always
container_name: error-pages container_name: error-pages
read_only: true read_only: true
@@ -19,9 +19,10 @@ services:
- "traefik.http.routers.error-pages-router.entrypoints=web" - "traefik.http.routers.error-pages-router.entrypoints=web"
- "traefik.http.routers.error-pages-router.middlewares=error-pages-middleware" - "traefik.http.routers.error-pages-router.middlewares=error-pages-middleware"
# "errors" middleware settings # "errors" middleware settings
- "traefik.http.middlewares.error-pages-middleware.errors.status=400-599" - "traefik.http.middlewares.error-pages-middleware.errors.status=400,402-502,504-599"
- "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service" - "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service"
- "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html" - "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html"
# define service properties # define service properties
- "traefik.http.services.error-pages-service.loadbalancer.server.port=8080" - "traefik.http.services.error-pages-service.loadbalancer.server.port=8080"
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "wud.watch=true"
+4 -4
View File
@@ -2,7 +2,7 @@ services:
update-test: update-test:
image: nginx:1.28.1 image: nginx:1.28.1
container_name: update-test container_name: update-test
profiles: ["core","all","test"] profiles: ["test"]
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] # returns 0 if Nginx is up test: ["CMD", "curl", "-f", "http://localhost"] # returns 0 if Nginx is up
interval: 5s interval: 5s
@@ -11,14 +11,14 @@ services:
start_period: 2s start_period: 2s
docker-update-exporter-test: docker-update-exporter-test:
profiles: ["core","all","test"] profiles: ["test"]
build: build:
context: ${PROJECT_ROOT}/core/test context: ${PROJECT_ROOT}/core/test
container_name: docker-update-exporter-test container_name: docker-update-exporter-test
stdin_open: true stdin_open: true
tty: true tty: true
depends_on: # depends_on:
- docker-socket-proxy # - docker-socket-proxy
environment: environment:
DOCKER_HOST: tcp://docker-socket-proxy:2375 DOCKER_HOST: tcp://docker-socket-proxy:2375
volumes: volumes:
+14 -7
View File
@@ -1,7 +1,7 @@
services: services:
traefik: traefik:
profiles: ["core","all","traefik"] profiles: ["core","all","traefik"]
image: traefik:3 image: traefik:latest
container_name: traefik container_name: traefik
restart: always restart: always
read_only: true read_only: true
@@ -16,19 +16,24 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
build: # build:
context: ${PROJECT_ROOT}/core # context: ${PROJECT_ROOT}/core
# env_file: # env_file:
# - ${PROJECT_ROOT}/secrets/stack-secrets.env # - ${PROJECT_ROOT}/secrets/stack-secrets.env
volumes: volumes:
- ${PROJECT_ROOT}/core/traefik/data/letsencrypt:/letsencrypt # - ${PROJECT_ROOT}/core/traefik/data/letsencrypt:/letsencrypt
- ${PROJECT_ROOT}/core/traefik/data/logs:/logs # - ${PROJECT_ROOT}/core/traefik/data/logs:/logs
- ${PROJECT_ROOT}/core/traefik/certs:/etc/traefik/certs:ro - ${PROJECT_ROOT}/core/traefik/certs:/etc/traefik/certs:ro
- ${PROJECT_ROOT}/core/traefik/dynamic.yml:/etc/traefik/dynamic.yml:ro - ${PROJECT_ROOT}/core/traefik/dynamic.yml:/etc/traefik/dynamic.yml:ro
- ${PROJECT_ROOT}/core/traefik/traefik.yml:/etc/traefik/traefik.yml:ro - ${PROJECT_ROOT}/core/traefik/traefik.yml:/etc/traefik/traefik.yml:ro
- ${PROJECT_ROOT}/core/traefik/data/plugins:/plugins-storage # - ${PROJECT_ROOT}/core/traefik/data/plugins:/plugins-storage
- ${DOCKER_VOLUMES}/traefik-data/letsencrypt:/letsencrypt
- ${DOCKER_VOLUMES}/traefik-data/logs:/logs
# - ${PROJECT_ROOT}/core/traefik/certs:/etc/traefik/certs:ro
# - ${PROJECT_ROOT}/core/traefik/dynamic.yml:/etc/traefik/dynamic.yml:ro
# - ${PROJECT_ROOT}/core/traefik/traefik.yml:/etc/traefik/traefik.yml:ro
- ${DOCKER_VOLUMES}/traefik-data/plugins:/plugins-storage
healthcheck: healthcheck:
test: traefik healthcheck --ping test: traefik healthcheck --ping
@@ -43,8 +48,10 @@ services:
- "io.portainer.accesscontrol.public" - "io.portainer.accesscontrol.public"
- "traefik.docker.network=core_traefik" - "traefik.docker.network=core_traefik"
- "traefik.http.routers.traefik.observability.tracing=true" - "traefik.http.routers.traefik.observability.tracing=true"
- "wud.watch=true"
networks: networks:
# - reverse_proxy # - reverse_proxy
# - prometheus_edge # - prometheus_edge
- traefik - traefik
- docker-socket-proxy
+57
View File
@@ -32,6 +32,63 @@ http:
# - tracing-middleware@file # - tracing-middleware@file
- error-pages-middleware@docker - error-pages-middleware@docker
serversTransports:
insecureTransport:
insecureSkipVerify: true
routers:
pve1:
rule: "Host(`pve1.lan.ddnsgeek.com`)"
entryPoints:
- websecure
service: pve1
middlewares:
- authelia@docker
tls:
certResolver: myresolver
options: mtls-private-admin@file
pbs:
rule: "Host(`pbs.lan.ddnsgeek.com`)"
entryPoints:
- websecure
service: pbs
middlewares:
- authelia@docker
tls:
certResolver: myresolver
options: mtls-private-admin@file
pdm:
rule: "Host(`pdm.lan.ddnsgeek.com`)"
entryPoints:
- websecure
service: pdm
middlewares:
- authelia@docker
tls:
certResolver: myresolver
options: mtls-private-admin@file
services:
pve1:
loadBalancer:
serversTransport: insecureTransport
servers:
- url: "https://pve1.sweet.home:8006"
pbs:
loadBalancer:
serversTransport: insecureTransport
servers:
- url: "https://pbs.sweet.home:8007"
pdm:
loadBalancer:
serversTransport: insecureTransport
servers:
- url: "https://pdm.sweet.home:8443"
tls: tls:
options: options:
mtls-private-admin: mtls-private-admin:
+1 -1
View File
@@ -1,5 +1,5 @@
log: log:
level: INFO level: DEBUG
accessLog: accessLog:
filePath: /logs/access.log filePath: /logs/access.log
+40 -9
View File
@@ -1,26 +1,39 @@
PROJECT_ROOT=/home/nixos/docker DATA_ROOT=/mnt/docker
PROJECT_ROOT=${DATA_ROOT}/config
DOMAIN=lan.ddnsgeek.com DOMAIN=lan.ddnsgeek.com
TZ=Australia/Brisbane TZ=Australia/Brisbane
EMAIL=wayne.bennett@live.com EMAIL=wayne.bennett@live.com
SECRETS_ENV_FILE=${PROJECT_ROOT}/secrets/stack-secrets.env SECRETS_ENV_FILE=${PROJECT_ROOT}/secrets/stack-secrets.env
# Data locations
DOCKER_VOLUMES=${DATA_ROOT}/volumes
DOCKER_DATABASES=${DATA_ROOT}/databases
# Core # Core
CROWDSEC_COLLECTIONS=crowdsecurity/traefik CROWDSEC_COLLECTIONS=crowdsecurity/traefik
ERROR_PAGES_TEMPLATE_NAME=app-down ERROR_PAGES_TEMPLATE_NAME=app-down
# Gitea # Gitea
GITEA_USER_UID=1000 GITEA_USER_UID=1000
GITEA_USER_GID=1000 GITEA_USER_GID=1000
GITEA_DB_TYPE=sqlite3 GITEA_DB_TYPE=sqlite3
GITEA_ROOT_URL=https://gitea.lan.ddnsgeek.com/ GITEA_ROOT_URL=https://gitea.${DOMAIN}/
# Generate a token in Gitea: Site Administration → Actions → Runners
# or Repo → Settings → Actions → Runners
GITEA_RUNNER_REGISTRATION_TOKEN=vYDNxzMvayREkXoaAR3x3UREkxQB2PU4eORzmkZ9
GITEA_RUNNER_NAME=docker-runner-01
GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bookworm,ubuntu-22.04:docker://node:20-bookworm,linux:docker://node:20-bookworm,docker:docker://docker:cli
# Grafana # Grafana
GRAFANA_ROOT_URL=https://grafana.lan.ddnsgeek.com/ GRAFANA_ROOT_URL=https://grafana.${DOMAIN}/
# Nextcloud # Nextcloud
NEXTCLOUD_DB_VERSION=11.4
NEXTCLOUD_MYSQL_DATABASE=nextcloud NEXTCLOUD_MYSQL_DATABASE=nextcloud
NEXTCLOUD_MYSQL_HOST=nextcloud_db:3306 NEXTCLOUD_MYSQL_HOST=nextcloud_db:3306
NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.lan.ddnsgeek.com NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN}
NEXTCLOUD_OVERWRITEPROTOCOL=https NEXTCLOUD_OVERWRITEPROTOCOL=https
NEXTCLOUD_OVERWRITECLIURL=https://${NEXTCLOUD_TRUSTED_DOMAINS} NEXTCLOUD_OVERWRITECLIURL=https://${NEXTCLOUD_TRUSTED_DOMAINS}
NEXTCLOUD_SMTP_HOST=smtp.gmail.com NEXTCLOUD_SMTP_HOST=smtp.gmail.com
@@ -30,18 +43,24 @@ NEXTCLOUD_SMTP_AUTHTYPE=login
NEXTCLOUD_REDIS_HOST=redis NEXTCLOUD_REDIS_HOST=redis
NEXTCLOUD_REDIS_HOST_PORT=6379 NEXTCLOUD_REDIS_HOST_PORT=6379
NEXTCLOUD_MARIADB_AUTO_UPGRADE=1 NEXTCLOUD_MARIADB_AUTO_UPGRADE=1
NEXTCLOUD_DATA=/mnt/nextcloud-data
# Passbolt # Passbolt
PASSBOLT_MYSQL_RANDOM_ROOT_PASSWORD=true PASSBOLT_MYSQL_RANDOM_ROOT_PASSWORD=true
PASSBOLT_MYSQL_DATABASE=passbolt PASSBOLT_MYSQL_DATABASE=passbolt
PASSBOLT_MYSQL_USER=passbolt PASSBOLT_MYSQL_USER=passbolt
PASSBOLT_APP_FULL_BASE_URL=https://passbolt.lan.ddnsgeek.com PASSBOLT_APP_FULL_BASE_URL=https://passbolt.${DOMAIN}
PASSBOLT_DATASOURCES_DEFAULT_HOST=passbolt-db PASSBOLT_DATASOURCES_DEFAULT_HOST=passbolt-db
# Gramps # Gramps
GRAMPSWEB_LOGLEVEL=INFO
GRAMPSWEB_MEDIAPATH=/app/media
GRAMPSWEB_TREE=main GRAMPSWEB_TREE=main
GRAMPSWEB_BASE_URL=https://familytree.${DOMAIN}
GRAMPSWEB_REGISTRATION_DISABLED=true
GRAMPSWEB_EMAIL_HOST=smtp.gmail.com
GRAMPSWEB_EMAIL_PORT=587
GRAMPSWEB_EMAIL_USE_SSL=false
GRAMPSWEB_EMAIL_USE_STARTTLS=true
GRAMPSWEB_DEFAULT_FROM_EMAIL=beatz174@gmail.com
# Prometheus stack # Prometheus stack
INFLUXDB_INIT_MODE=setup INFLUXDB_INIT_MODE=setup
@@ -61,7 +80,7 @@ PORTAINER_GODEBUG=netdns=cgo
# Node-red # Node-red
DOCKER_SOCKET_PROXY_HOST=tcp://docker-socket-proxy:2375 DOCKER_SOCKET_PROXY_HOST=tcp://docker-socket-proxy:2375
DOCKER_SOCKET_PROXY_LOG_LEVEL=debug DOCKER_SOCKET_PROXY_LOG_LEVEL=info
NODE_COMPOSE_ROOT=/compose NODE_COMPOSE_ROOT=/compose
# mTLS bridge # mTLS bridge
@@ -69,4 +88,16 @@ MTLS_BRIDGE_LOG_LEVEL=DEBUG
MTLS_BRIDGE_TIMEOUT=5 MTLS_BRIDGE_TIMEOUT=5
MTLS_BRIDGE_CLIENT_KEY=/certs/clients/office-pc/office-pc.key MTLS_BRIDGE_CLIENT_KEY=/certs/clients/office-pc/office-pc.key
MTLS_BRIDGE_CLIENT_CERT=/certs/clients/office-pc/office-pc.crt MTLS_BRIDGE_CLIENT_CERT=/certs/clients/office-pc/office-pc.crt
MTLS_BRIDGE_TARGET_URL=http://node-red:1880/docker-update-lockouts/clear MTLS_BRIDGE_TARGET_URL=http://node-red:1880
MTLS_BRIDGE_ALLOWED_PATHS_FILE=
MTLS_BRIDGE_CORS_ALLOW_ORIGIN=https://grafana.${DOMAIN}
# Whats up Docker
WUD_WATCHER_LOCAL_CRON="0 */6 * * *"
WUD_WATCHER_LOCAL_HOST=docker-socket-proxy
WUD_WATCHER_LOCAL_WATCHBYDEFAULT=false
WUD_WATCHER_RASPI_HOST=raspberrypi.tail13f623.ts.net
WUD_TRIGGER_GOTIFY_URL=http://gotify
WUD_TRIGGER_GOTIFY_TOKEN=ARPi3hyrAdEUSu6
WUD_TRIGGER_GOTIFY_PRIORITY=5
+2 -1
View File
@@ -4,4 +4,5 @@ networks:
ipam: ipam:
config: config:
- subnet: 172.21.0.0/16 - subnet: 172.21.0.0/16
monitor: # monitor:
docker-socket-proxy:
-1
View File
@@ -1 +0,0 @@
/mnt/docker-persistent-data/docker
+41
View File
@@ -0,0 +1,41 @@
# Generated Documentation
## Local generation
Install prerequisites:
```bash
sudo apt-get update
sudo apt-get install -y graphviz
```
Then generate and validate public docs:
```bash
chmod +x scripts/docs/*.sh
scripts/docs/generate-all.sh
python3 -m mkdocs build -f mkdocs-public.yml --strict
```
NixOS-friendly alternative:
```bash
nix shell nixpkgs#graphviz nixpkgs#python3 nixpkgs#python3Packages.pyyaml
```
This pipeline only runs `docker compose config` and static parsing. It does **not** start containers.
## CI behaviour
GitHub Actions workflow `.github/workflows/generate-docs.yml` validates committed public docs and diagrams and runs a strict public MkDocs build.
## Outputs
- `docs/generated`: resolved compose config and markdown inventories
- `docs/diagrams`: generated DOT and SVG diagrams
- `docs/public`: sanitized copy for public sharing
## Publication safety
- `docs/public` is intended for public sharing after sanitization.
- `docs/generated` and `docs/diagrams` may include internal details and should be treated as internal by default.
+72
View File
@@ -0,0 +1,72 @@
# Ansible Workflows (Bootstrap / Phase 1)
Ansible is being introduced as a minimal, maintainable foundation for host/device inventory and future configuration workflows.
## Why introduce Ansible now
- The repository already has strong runtime and infrastructure boundaries (Compose + Terraform).
- A small Ansible baseline allows gradual host onboarding without forcing immediate large-scale automation.
- It enables safe validation workflows (`inventory --list`, playbook syntax checks) before real execution.
## What Ansible is for in this repository (right now)
- YAML inventory structure for hosts/devices to be onboarded over time.
- Group and host variable scaffolding for future incremental adoption.
- Validation-oriented starter playbook and local tooling checks.
## What Ansible is not for yet
- Replacing Docker Compose runtime authority.
- Replacing Terraform inventory/reconciliation authority.
- Becoming the current source of truth for NixOS host management.
- Becoming the current source of truth for all network automation.
## Directory layout
- `infrastructure/ansible/ansible.cfg`
- `infrastructure/ansible/inventory/hosts.yml`
- `infrastructure/ansible/inventory/group_vars/`
- `infrastructure/ansible/inventory/host_vars/`
- `infrastructure/ansible/playbooks/ping.yml`
- `infrastructure/ansible/collections/requirements.yml`
## Add a host (gradual onboarding)
1. Open `infrastructure/ansible/inventory/hosts.yml`.
2. Add the host under an appropriate group (`linux`, `network`, `virtualization`, or `nixos`).
3. Add non-sensitive defaults under group vars only when shared across hosts.
4. Add host-specific values in `inventory/host_vars/<hostname>.yml`.
5. Keep secrets out of committed files.
Example pattern:
```yaml
linux:
hosts:
my-host:
ansible_host: my-host.local
```
## Validation commands
Run from repository root:
```bash
ansible --version
ansible-lint --version
ansible-inventory -i infrastructure/ansible/inventory/hosts.yml --list
ansible-playbook -i infrastructure/ansible/inventory/hosts.yml infrastructure/ansible/playbooks/ping.yml --syntax-check
```
Install/update baseline collections:
```bash
ansible-galaxy collection install -r infrastructure/ansible/collections/requirements.yml -p infrastructure/ansible/collections
```
## Guardrails for future expansion
- Keep changes incremental (one host/group/playbook change at a time).
- Prefer simple playbooks before introducing roles.
- Add network-platform/NixOS-specific logic only when those boundaries are explicitly adopted.
- Keep documentation aligned with source-of-truth boundaries when Ansible authority evolves.
Loaded 100 of 308 files, more files were not shown because too many files have changed in this diff. Show more