From 29bc56b8a5a6d4a1d11d7b5167e641af7fe17008 Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Mon, 18 Nov 2024 20:44:33 +0100
Subject: [PATCH] Arion: Move ntfy to ssd

---
 hosts/franz/arion/push/arion-compose.nix      |  4 +--
 hosts/franz/restic.nix                        | 32 +++++++++++--------
 .../{ntfy_data => ntfy_config}/server.yml     |  0
 3 files changed, 20 insertions(+), 16 deletions(-)
 rename rsc/docker/franz/push/{ntfy_data => ntfy_config}/server.yml (100%)

diff --git a/hosts/franz/arion/push/arion-compose.nix b/hosts/franz/arion/push/arion-compose.nix
index 6212010..ad78c44 100644
--- a/hosts/franz/arion/push/arion-compose.nix
+++ b/hosts/franz/arion/push/arion-compose.nix
@@ -31,8 +31,8 @@
         "traefik.http.routers.ntfy-external.tls.certresolver" = "letsencrypt";
       };
       volumes = [
-        "/home/ghoscht/.docker/push/ntfy_data/server.yml:/etc/ntfy/server.yml"
-        "/storage/dataset/docker/push/ntfy_data:/etc/ntfy/data"
+        "/home/ghoscht/.docker/push/ntfy_config/server.yml:/etc/ntfy/server.yml"
+        "/home/ghoscht/.docker/push/ntfy_data:/etc/ntfy/data"
       ];
       environment = {
         TZ = "Europe/Berlin";
diff --git a/hosts/franz/restic.nix b/hosts/franz/restic.nix
index eb93070..b14b3f4 100644
--- a/hosts/franz/restic.nix
+++ b/hosts/franz/restic.nix
@@ -46,9 +46,6 @@ in {
   sops.secrets."autorestic/zfs_key" = {
     owner = vars.user;
   };
-  sops.secrets."autorestic/ssd_key" = {
-    owner = vars.user;
-  };
   sops.secrets."autorestic/eustachius_key" = {
     owner = vars.user;
   };
@@ -173,7 +170,6 @@ in {
           from: /home/ghoscht/.docker/passwords
           to:
             - zfs
-            # - ssd
             - eustachius
           cron: '0 4 * * *' # Every Day at 4:00
           hooks:
@@ -182,19 +178,31 @@ in {
               -  arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix stop
             after:
               -  arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix start
-        matrix:
-          from: /home/ghoscht/.docker/matrix
+        push:
+          from: /storage/dataset/docker/push/
           to:
             - zfs
             - eustachius
-          forget: prune
-          cron: '0 4 * * 0' # Every Sunday at 4:00
+          cron: '0 4 * * *' # Every Day at 4:00
           hooks:
             <<: *default_hooks
             before:
-              -  arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/push/arion-compose.nix -p ${arionPath}/push/arion-pkgs.nix stop
             after:
-              -  arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix start
+              -  arion -f ${arionPath}/push/arion-compose.nix -p ${arionPath}/push/arion-pkgs.nix start
+        # matrix:
+        #   from: /home/ghoscht/.docker/matrix
+        #   to:
+        #     - zfs
+        #     - eustachius
+        #   forget: prune
+        #   cron: '0 4 * * 0' # Every Sunday at 4:00
+        #   hooks:
+        #     <<: *default_hooks
+        #     before:
+        #       -  arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix stop
+        #     after:
+        #       -  arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix start
         music:
           from: /storage/dataset/data/media/music
           to:
@@ -299,10 +307,6 @@ in {
           type: local
           path: /storage/dataset/backups
           key: '${config.sops.placeholder."autorestic/zfs_key"}'
-        # ssd:
-        #   type: local
-        #   path: /home/ghoscht/Backups
-        #   key: '${config.sops.placeholder."autorestic/ssd_key"}'
         eustachius:
           type: rest
           path: http://100.64.0.3:8000/franz
diff --git a/rsc/docker/franz/push/ntfy_data/server.yml b/rsc/docker/franz/push/ntfy_config/server.yml
similarity index 100%
rename from rsc/docker/franz/push/ntfy_data/server.yml
rename to rsc/docker/franz/push/ntfy_config/server.yml