From 70cd7cb6018f431e7a01173bd220e2a67d596d41 Mon Sep 17 00:00:00 2001 From: geezo Date: Sat, 15 Feb 2025 23:20:26 +0000 Subject: [PATCH] a bunch of changes --- .gitignore | 3 +- .../changedetection}/docker-compose.yml | 0 .../ghostboard}/docker-compose.yml | 0 .../mongo_db}/docker-compose.yml | 0 .../pinchflat}/docker-compose.yml | 0 autorestic/config.yaml | 104 +++++------------- autorestic/config.yaml.old | 16 +++ autorestic/docker-compose.yml | 3 + beszel/docker-compose.yml | 23 ++++ caddy/conf/Caddyfile | 29 +++-- caddy/docker-compose.yml | 3 + olivetin/config.yaml | 2 +- 12 files changed, 95 insertions(+), 88 deletions(-) rename {changedetection => _archive/changedetection}/docker-compose.yml (100%) rename {ghostboard => _archive/ghostboard}/docker-compose.yml (100%) rename {mongo_db => _archive/mongo_db}/docker-compose.yml (100%) rename {pinchflat => _archive/pinchflat}/docker-compose.yml (100%) create mode 100644 autorestic/config.yaml.old create mode 100644 beszel/docker-compose.yml diff --git a/.gitignore b/.gitignore index 13982a1..80e6265 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ data/ immich/library immich/postgres yams/config -.export/ \ No newline at end of file +.export/ +beszel_data/ \ No newline at end of file diff --git a/changedetection/docker-compose.yml b/_archive/changedetection/docker-compose.yml similarity index 100% rename from changedetection/docker-compose.yml rename to _archive/changedetection/docker-compose.yml diff --git a/ghostboard/docker-compose.yml b/_archive/ghostboard/docker-compose.yml similarity index 100% rename from ghostboard/docker-compose.yml rename to _archive/ghostboard/docker-compose.yml diff --git a/mongo_db/docker-compose.yml b/_archive/mongo_db/docker-compose.yml similarity index 100% rename from mongo_db/docker-compose.yml rename to _archive/mongo_db/docker-compose.yml diff --git a/pinchflat/docker-compose.yml b/_archive/pinchflat/docker-compose.yml similarity index 100% rename from pinchflat/docker-compose.yml rename to _archive/pinchflat/docker-compose.yml diff --git a/autorestic/config.yaml b/autorestic/config.yaml index dca5ee2..7328e10 100644 --- a/autorestic/config.yaml +++ b/autorestic/config.yaml @@ -1,83 +1,29 @@ -version: 2 - backends: - 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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 - + albatross: + type: local + path: /docker_volume_backups + key: HLyF8VQngqt6cEWRHJsZ2gzb0FQ4alfFnxuoFMS6bS4R8pZJMQ4PeHg5fTOZTtytnQPSnsuKlSSzwcpTA + requirekey: false + env: {} + rest: + user: "" + password: "" + options: {} locations: - local_files: - from: - - /immich/library - # - /home/geezo/docker_containers/navidrome/music - # - /home/geezo/media - to: - - aws_s3 - - hoarder_meilisearch: - from: hoarder_meilisearch + caddy_caddy_config: + from: + - caddy_caddy_config type: volume to: - - 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 - - pinchflat_pinchflat_data: - from: pinchflat_pinchflat_data - type: volume - to: - - aws_s3 \ No newline at end of file + - albatross + hooks: + dir: "" + prevalidate: [] + before: [] + after: [] + success: [] + failure: [] + cron: "" + options: {} + copyoption: {} +version: 2 diff --git a/autorestic/config.yaml.old b/autorestic/config.yaml.old new file mode 100644 index 0000000..e55da6e --- /dev/null +++ b/autorestic/config.yaml.old @@ -0,0 +1,16 @@ +version: 2 + +backends: + albatross: + type: local + path: "/docker_volume_backups" + +locations: + caddy_caddy_config: + from: caddy_caddy_config + type: volume + to: + - albatross + + + \ No newline at end of file diff --git a/autorestic/docker-compose.yml b/autorestic/docker-compose.yml index 12eb0a0..4134922 100644 --- a/autorestic/docker-compose.yml +++ b/autorestic/docker-compose.yml @@ -5,9 +5,12 @@ services: image: cupcakearmy/autorestic container_name: autorestic privileged: true + environment: + - RESTIC_REPOSITORY=albatross volumes: - /home/geezo/docker_containers/autorestic:/data - /home/geezo/docker_containers/immich:/immich - /var/run/docker.sock:/var/run/docker.sock + - /home/geezo/nfs_shares/docker_volume_backups:/docker_volume_backups command: autorestic backup -va -c /data/config.yaml restart: no \ No newline at end of file diff --git a/beszel/docker-compose.yml b/beszel/docker-compose.yml new file mode 100644 index 0000000..3339536 --- /dev/null +++ b/beszel/docker-compose.yml @@ -0,0 +1,23 @@ +services: + beszel: + image: henrygd/beszel:latest + container_name: beszel + restart: unless-stopped + extra_hosts: + - host.docker.internal:host-gateway + ports: + - 1018:8090 + volumes: + - ./beszel_data:/beszel_data + + beszel-agent: + image: henrygd/beszel-agent:latest + container_name: beszel-agent + restart: unless-stopped + network_mode: host + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + environment: + PORT: 45876 + # Do not remove quotes around the key + KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeG11Y+SwGWJyIkheCNayVRHbvBnvoSdk24P1IVPMsp' \ No newline at end of file diff --git a/caddy/conf/Caddyfile b/caddy/conf/Caddyfile index 055ab52..b4d258c 100644 --- a/caddy/conf/Caddyfile +++ b/caddy/conf/Caddyfile @@ -6,27 +6,27 @@ gitea.theocorp { glance.theocorp { tls internal - reverse_proxy glance-glance-1:8080 + reverse_proxy glance:8080 } hoarder.theocorp { tls internal - reverse_proxy hoarder-web-1:3000 + reverse_proxy hoarder:3000 } immich.theocorp { tls internal - reverse_proxy immich_server:2283 + reverse_proxy immich:2283 } n8n.theocorp { tls internal - reverse_proxy n8n-n8n-1:5678 + reverse_proxy n8n:5678 } navidrome.theocorp { tls internal - reverse_proxy navidrome-navidrome-1:4533 + reverse_proxy navidrome:4533 } olivetin.theocorp { @@ -41,15 +41,30 @@ paperless-ai.theocorp { paperless.theocorp { tls internal - reverse_proxy paperless-ngx-webserver-1:8000 + reverse_proxy paperless-ngx:8000 } portainer.theocorp { tls internal - reverse_proxy portainer-portainer-1:9000 + reverse_proxy portainer:9000 } vaultwarden.theocorp { tls internal reverse_proxy vaultwarden:80 } + +beszel.theocorp { + tls internal + reverse_proxy beszel:8090 +} + +dozzle.theocorp { + tls internal + reverse_proxy dozzle:8080 +} + +hastebin.theocorp { + tls internal + reverse_proxy hastebin:7777 +} \ No newline at end of file diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index 913dcf0..66523be 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -28,6 +28,7 @@ services: - paperless-ngx_default - vaultwarden_default - yams_default + - bezel_default volumes: caddy_data: @@ -58,4 +59,6 @@ networks: vaultwarden_default: external: true yams_default: + external: true + bezel_default: external: true \ No newline at end of file diff --git a/olivetin/config.yaml b/olivetin/config.yaml index a4bd365..fcae9ab 100644 --- a/olivetin/config.yaml +++ b/olivetin/config.yaml @@ -1,6 +1,6 @@ actions: - title: backup containers - shell: "docker compose -f /autorestic/docker-compose.yml up" + shell: "docker compose -f /home/geezo/docker_containers/autorestic/docker-compose.yml up" icon: execOnCron: - "@daily"