From 465bafab7196169945bbee5ee0c40436fe23c5ba Mon Sep 17 00:00:00 2001 From: geezo Date: Sun, 16 Feb 2025 03:29:30 +0000 Subject: [PATCH] crap ton of changes --- autorestic/config.yaml | 98 ++++++++++++++++++++++++-------- autorestic/docker-compose.yml | 2 - beszel/docker-compose.yml | 9 ++- caddy/docker-compose.yml | 7 ++- dozzle/docker-compose.yml | 9 ++- gitea/docker-compose.yml | 1 + glance/config/glance.yml | 36 +++--------- glance/docker-compose.yml | 11 ++++ hastebin/docker-compose.yml | 6 ++ hoarder/docker-compose.yml | 15 +++++ immich/docker-compose.yml | 8 ++- navidrome/docker-compose.yml | 17 +++++- nextcloud/docker-compose.yml | 14 +++++ olivetin/config.yaml | 2 +- olivetin/docker-compose.yml | 9 ++- paperless-ngx/docker-compose.yml | 6 ++ portainer/docker-compose.yml | 6 ++ vaultwarden/docker-compose.yml | 13 ++++- 18 files changed, 204 insertions(+), 65 deletions(-) diff --git a/autorestic/config.yaml b/autorestic/config.yaml index 7328e10..3ed6031 100644 --- a/autorestic/config.yaml +++ b/autorestic/config.yaml @@ -1,29 +1,77 @@ +version: 2 + backends: - albatross: - type: local - path: /docker_volume_backups - key: HLyF8VQngqt6cEWRHJsZ2gzb0FQ4alfFnxuoFMS6bS4R8pZJMQ4PeHg5fTOZTtytnQPSnsuKlSSzwcpTA - requirekey: false - env: {} - rest: - user: "" - password: "" - options: {} + aws_s3: + type: s3 + path: s3.amazonaws.com/284a418918ee0b6d99972d836ddd6840 + key: "#4famakin" + env: + AWS_ACCESS_KEY_ID: AKIA4XIDYLVKXZWMVHWI + AWS_SECRET_ACCESS_KEY: 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 + locations: - caddy_caddy_config: - from: - - caddy_caddy_config + local_files: + from: + - /immich/library + # - /home/geezo/docker_containers/navidrome/music + # - /home/geezo/media + to: + - aws_s3 + + hoarder_meilisearch: + from: hoarder_meilisearch type: volume to: - - albatross - hooks: - dir: "" - prevalidate: [] - before: [] - after: [] - success: [] - failure: [] - cron: "" - options: {} - copyoption: {} -version: 2 + - aws_s3 + hoarder_hoarder_data: + from: hoarder_hoarder_data + type: volume + to: + - aws_s3 + gitea_gitea_data: + from: gitea_gitea_data + type: volume + to: + - aws_s3 + + gitea_postgres_data: + from: gitea_postgres_data + type: volume + to: + - aws_s3 + + navidrome_navidrome_data: + from: navidrome_navidrome_data + type: volume + to: + - aws_s3 + + portainer_portainer_data: + from: portainer_portainer_data + type: volume + to: + - aws_s3 + + nextcloud_db: + from: nextcloud_db + type: volume + to: + - aws_s3 + + nextcloud_nextcloud: + from: nextcloud_nextcloud + type: volume + to: + - aws_s3 + + immich_model-cache: + from: immich_model-cache + type: volume + to: + - aws_s3 + + vaultwarden_vaultwarden_data: + from: vaultwarden_vaultwarden_data + type: volume + to: + - aws_s3 diff --git a/autorestic/docker-compose.yml b/autorestic/docker-compose.yml index 4134922..1197c7d 100644 --- a/autorestic/docker-compose.yml +++ b/autorestic/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: autorestic: image: cupcakearmy/autorestic diff --git a/beszel/docker-compose.yml b/beszel/docker-compose.yml index 3339536..260772b 100644 --- a/beszel/docker-compose.yml +++ b/beszel/docker-compose.yml @@ -9,6 +9,12 @@ services: - 1018:8090 volumes: - ./beszel_data:/beszel_data + labels: + glance.name: Beszel + glance.icon: si:jellyfin + glance.url: https://beszel.theocorp + glance.description: Server Monitoring + glance.hide: false beszel-agent: image: henrygd/beszel-agent:latest @@ -20,4 +26,5 @@ services: environment: PORT: 45876 # Do not remove quotes around the key - KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeG11Y+SwGWJyIkheCNayVRHbvBnvoSdk24P1IVPMsp' \ No newline at end of file + KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeG11Y+SwGWJyIkheCNayVRHbvBnvoSdk24P1IVPMsp' + \ No newline at end of file diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index 66523be..ac9d72a 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -28,7 +28,8 @@ services: - paperless-ngx_default - vaultwarden_default - yams_default - - bezel_default + - beszel_default + - dozzle_default volumes: caddy_data: @@ -60,5 +61,7 @@ networks: external: true yams_default: external: true - bezel_default: + beszel_default: + external: true + dozzle_default: external: true \ No newline at end of file diff --git a/dozzle/docker-compose.yml b/dozzle/docker-compose.yml index 937b577..0c316e8 100644 --- a/dozzle/docker-compose.yml +++ b/dozzle/docker-compose.yml @@ -5,4 +5,11 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock ports: - - 1015:8080 \ No newline at end of file + - 1015:8080 + labels: + glance.name: Dozzer + glance.icon: si:jellyfin + glance.url: https://dozzer.theocorp + glance.description: Container Logs + glance.hide: false + \ No newline at end of file diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 76ff55f..fe929a0 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -31,6 +31,7 @@ services: postgres: image: postgres:14 + container_name: gitea-portgress restart: always environment: - POSTGRES_USER=gitea diff --git a/glance/config/glance.yml b/glance/config/glance.yml index d3fc750..824caed 100644 --- a/glance/config/glance.yml +++ b/glance/config/glance.yml @@ -1,7 +1,9 @@ theme: - background-color: 50 1 6 + background-color: 220, 25, 5 # Near-black navy for a sleek, ultra-dark look contrast-multiplier: 1.2 - primary-color: 217 92 83 + primary-color: 210, 60, 30 # Deep, rich blue for a subtle but stylish accent + positive-color: 190, 45, 20 # Dark teal for a modern, professional feel + negative-color: 355, 50, 25 # Muted crimson for a softer, low-contrast warning pages: - name: Startpage @@ -11,33 +13,9 @@ pages: widgets: - type: search autofocus: true - - - type: monitor - cache: 1m - title: Services - sites: - - title: Gitea - url: "https://gitea.theocorp" - - title: Glance - url: "https://glance.theocorp" - - title: Hoarder - url: "https://hoarder.theocorp" - - title: Immich - url: "https://immich.theocorp" - - title: n8n - url: "https://n8n.theocorp" - - title: Navidrome - url: "https://navidrome.theocorp" - - title: Olivetin - url: "https://olivetin.theocorp" - - title: Paperless AI - url: "https://paperless-ai.theocorp" - - title: Paperless - url: "https://paperless.theocorp" - - title: Portainer - url: "https://portainer.theocorp" - - title: Vaultwarden - url: "https://vaultwarden.theocorp" + + - type: docker-containers + hide-by-default: true - type: bookmarks groups: diff --git a/glance/docker-compose.yml b/glance/docker-compose.yml index 46f9144..acc9a38 100644 --- a/glance/docker-compose.yml +++ b/glance/docker-compose.yml @@ -6,6 +6,17 @@ services: - ./config:/app/config - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock ports: - 1005:8080 restart: unless-stopped + networks: + - tunnel + - default + + + +networks: + tunnel: + external: true + default: diff --git a/hastebin/docker-compose.yml b/hastebin/docker-compose.yml index 8b4fe2f..2f13b48 100644 --- a/hastebin/docker-compose.yml +++ b/hastebin/docker-compose.yml @@ -7,6 +7,12 @@ services: STORAGE_HOST: hastebinredis ports: - "1006:7777" + labels: + glance.name: Hastebin + glance.icon: si:jellyfin + glance.url: https://hastebin.theocorp + glance.description: Private Note Bin + glance.hide: false hastebinredis: container_name: hastebinredis image: redis diff --git a/hoarder/docker-compose.yml b/hoarder/docker-compose.yml index 6f49395..5387dc7 100644 --- a/hoarder/docker-compose.yml +++ b/hoarder/docker-compose.yml @@ -15,6 +15,15 @@ services: BROWSER_WEB_URL: http://chrome:9222 OPENAI_API_KEY: "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" DATA_DIR: /data + networks: + - tunnel + - default + labels: + glance.name: Hoarder + glance.icon: si:jellyfin + glance.url: https://hoarder.theocorp + glance.description: Link saving + glance.hide: false chrome: container_name: hoarder-chrome image: gcr.io/zenika-hub/alpine-chrome:123 @@ -40,3 +49,9 @@ services: volumes: meilisearch: hoarder_data: + + +networks: + tunnel: + external: true + default: \ No newline at end of file diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml index 03103af..eccf651 100644 --- a/immich/docker-compose.yml +++ b/immich/docker-compose.yml @@ -29,6 +29,12 @@ services: restart: always healthcheck: disable: false + labels: + glance.name: Immich + glance.icon: si:immich + glance.url: https://immich.theocorp + glance.description: Picture Storage Cloud + glance.hide: false immich-machine-learning: container_name: immich-machine-learning @@ -54,7 +60,7 @@ services: restart: always database: - container_name: immich_postgres + container_name: immich-postgres image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0 environment: POSTGRES_PASSWORD: ${DB_PASSWORD} diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml index 5b0a2c3..761226c 100644 --- a/navidrome/docker-compose.yml +++ b/navidrome/docker-compose.yml @@ -16,6 +16,21 @@ services: volumes: - "./data:/data" - "./:/music:ro" + networks: + - tunnel + - default + labels: + glance.name: Navidrome + glance.icon: si:applemusic + glance.url: https://navidrome.geezo.io + glance.description: Music Server + glance.hide: false volumes: - navidrome_data: \ No newline at end of file + navidrome_data: + + +networks: + tunnel: + external: true + default: \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index e714901..04d5d0e 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -32,3 +32,17 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db + networks: + - tunnel + - default + labels: + glance.name: NextCloud + glance.icon: si:nextcloud + glance.url: https://cloud.geezo.io + glance.description: Private Cloud + glance.hide: false + +networks: + tunnel: + external: true + default: \ No newline at end of file diff --git a/olivetin/config.yaml b/olivetin/config.yaml index fcae9ab..35f927e 100644 --- a/olivetin/config.yaml +++ b/olivetin/config.yaml @@ -1,6 +1,6 @@ actions: - title: backup containers - shell: "docker compose -f /home/geezo/docker_containers/autorestic/docker-compose.yml up" + shell: "docker run --rm -d --privileged -v /home/geezo/docker_containers/autorestic:/data -v /var/run/docker.sock:/var/run/docker.sock cupcakearmy/autorestic autorestic backup -va -c /data/config.yaml" icon: execOnCron: - "@daily" diff --git a/olivetin/docker-compose.yml b/olivetin/docker-compose.yml index aee1795..59ab5ce 100644 --- a/olivetin/docker-compose.yml +++ b/olivetin/docker-compose.yml @@ -10,4 +10,11 @@ services: - "1004:1337" restart: unless-stopped privileged: true - user: root \ No newline at end of file + user: root + command: apt-get install docker-compose-plugin + labels: + glance.name: Olivetin + glance.icon: si:purescript + glance.url: https://olivetin.theocorp + glance.description: Canned Scripts UI + glance.hide: false \ No newline at end of file diff --git a/paperless-ngx/docker-compose.yml b/paperless-ngx/docker-compose.yml index 1da8f45..70abd97 100644 --- a/paperless-ngx/docker-compose.yml +++ b/paperless-ngx/docker-compose.yml @@ -65,6 +65,12 @@ services: PAPERLESS_REDIS: redis://broker:6379 PAPERLESS_DBHOST: db PAPERLESS_URL: https://paperless.theocorp + labels: + glance.name: Paperless + glance.icon: si:paperlessngx + glance.url: https://paperless.theocorp + glance.description: Document Storage + glance.hide: false volumes: data: diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml index 32da5f1..c41672e 100644 --- a/portainer/docker-compose.yml +++ b/portainer/docker-compose.yml @@ -9,5 +9,11 @@ services: - portainer_data:/data - /var/run/docker.sock:/var/run/docker.sock restart: unless-stopped + labels: + glance.name: Portainer + glance.icon: si:portainer + glance.url: https://portainer.theocorp + glance.description: Container Management UI + glance.hide: false volumes: portainer_data: \ No newline at end of file diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 5b69df7..479c527 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -9,5 +9,16 @@ services: - vaultwarden_data:/data/ ports: - 1008:80 + networks: + - tunnel + - default + + volumes: - vaultwarden_data: \ No newline at end of file + vaultwarden_data: + + +networks: + tunnel: + external: true + default: \ No newline at end of file