finish new backups and restructure gameservers

hosts/nixos/snowbelle/configuration.nix

@@ -13,7 +13,7 @@ in
       ../../../modules/system
       ../../../modules/holocron
       ../../../modules/homelab
-      ../../../modules/homelab/minecraft_recpro
+      ../../../modules/gameservers/minecraft_recpro
     ];
 
   system = {

modules/gameservers/minecraft_recpro/default.nix

@@ -3,15 +3,7 @@
   config,
   lib,
   ...
-}:
-/*
-to restore db make sure it exists with rebuild or command below
-then use zstd command to decompress and restore in one go
-
-mysql -u root -p -e "CREATE DATABASE IF NOT EXISTS minecraft_recpro_db;"
-zstd -dc <path_to_backup> | mysql -u root -p minecraft_recpro_db
-*/
-let
+}: let
   service = "minecraft_recpro";
   cfg = config.gameservers.${service};
   sec = config.sops.secrets;

modules/homelab/backups/default.nix

@@ -4,7 +4,17 @@
   pkgs,
   ...
 }:
-/**/
+/*
+to restore mysql/marinadb database:
+mysql -u root -p -e "DROP DATABASE IF EXISTS <database_name>;"  # delete old db if still lingering
+mysql -u root -p -e "CREATE DATABASE IF NOT EXISTS <database_name>;"  # create empty db w/ correct name
+zstd -dc <path_to_backup> | mysql -u root -p <database_name>
+
+to restore a postgres database:
+sudo -u postgres psql -c "DROP DATABASE IF EXISTS <database_name>;"   # delete old db if lingering (prolly wont work)
+sudo -u postgres psql -c "CREATE DATABASE <database_name>;"   # create empty db w/ correct name
+zstd -dc <path_to_backup> | sudo -u postgres psql -d immich   # restore from the dump
+*/
 let
   cfg = config.homelab.backups;
   sec = config.sops.secrets;
@@ -30,10 +40,14 @@ in {
         repo = cfg.backup_repo;
         paths = lib.flatten (lib.attrsets.mapAttrsToList (_: arg: arg.paths) cfg.baks);
         compression = "auto,zstd";
-        startAt = "daily";
+        startAt = "03:30";
         group = "archives";
         encryption.mode = "repokey-blake2";
         encryption.passCommand = "cat ${sec."borg_passwd".path}";
+        preHook = ''
+          systemctl start mysql-backup.service
+          systemctl start $(systemctl list-unit-files 'postgresqlBackup-*.service' --no-legend --no-pager | cut -d' ' -f1)
+        '';
         extraArgs = ["--verbose" "--show-rc" "--umask" "0007"];
         extraCreateArgs = ["--list" "--stats" "--filter" "AME"];
         prune.keep = {
@@ -45,20 +59,20 @@ in {
       };
 
     # mysql backups currently minecraft_recpro is the only thing using this
-    services.mysqlBackup = lib.mkIf config.services.mysql.enable {
+    services.mysqlBackup = lib.mkIf (config.services.mysql.ensureDatabases != []) {
       enable = true;
       location = "/var/backup/mysql";
       user = "root";
-      calendar = "*-*-* *:59:45"; # goes fast, included in back up with server dirs at **:00
+      calendar = "daily"; # goes fast, included in back up with server dirs at **:00
       compressionAlg = "zstd";
       databases = config.services.mysql.ensureDatabases; # set to all databases defined in esure databases
     };
     # postgresql backups currently immich is the only user
-    services.postgresqlBackup = lib.mkIf config.services.postgresql.enable {
+    services.postgresqlBackup = lib.mkIf (config.services.postgresql.ensureDatabases != []) {
       enable = true;
       location = "/var/backup/postgresql";
       compression = "zstd"; # optional: "xz", "zstd", "none"
-      startAt = "03:59"; # the dump is included in a backup taken at 4:00
+      startAt = "daily"; # the dump is included in a backup taken at 4:00
       databases = config.services.postgresql.ensureDatabases; # set to all databases defined in esure databases
     };
 

modules/homelab/immich/default.nix

@@ -5,14 +5,7 @@
   inputs,
   unstable_pkgs,
   ...
-}:
-/*
-to restore database ensure it exists 
-
-sudo -u postgres psql -c "DROP DATABASE IF EXISTS immich; CREATE DATABASE immich;"
-zstd -dc <path_to_backup> | sudo -u postgres psql -d immich
-*/
-let
+}: let
   service = "immich";
   cfg = config.homelab.${service};
   sec = config.sops.secrets;
@@ -115,7 +108,9 @@ in {
     ];
 
     # add postgresql database that is automatically created to the backup list
-    services.postgresqlBackup.databases = ["immich"]; # set to all databases defined in esure databases
+    #services.postgresqlBackup.databases = ["immich"]; # set to all databases defined in esure databases
+
+    services.postgresql.ensureDatabases = [service]; # set to all databases defined in esure databases
 
     # add to backups
     homelab.backups.baks = {