hosts/Alaska/default.nix

@@ -24,19 +24,7 @@
     tmp_mount_point = /Aurora/backup_drive_mount_point;
     backup1_drive_label = "AlaskaBackup";
 
-    vaultwarden = {
-      enable = true;
-      backup_dir = "/Aurora/Backups/Vaultwarden";
-    };
-
-    forgejo = {
-      enable = true;
-      backups_dir = "/Aurora/Backups/Forgejo";
-      save_old_count = 5;
-    };
-
     nextcloud = {
-      enable = true;
       root_dir = /Aurora/nextcloud;
       db_server = "127.0.0.1";
       db_name = "nextcloud";

hosts/Alaska/modules/backup_script.nix

@@ -32,39 +32,8 @@ in
       '';
     };
 
-    forgejo = {
-      enable = lib.mkEnableOption (lib.mdDoc "Back up Forgejo instance");
-
-      backups_dir = lib.mkOption {
-        type = lib.types.path;
-        default = "/Aurora/Backups/Forgejo";
-        description = lib.mdDoc ''
-          The path where Gitea/Forgejo backups are dumped
-        '';
-      };
-      save_old_count = lib.mkOption {
-        type = lib.types.int;
-        default = 3;
-        description = lib.mdDoc ''
-          The number of backups to save before deleting the oldest
-        '';
-      };
-    };
-
-    vaultwarden = {
-      enable = lib.mkEnableOption (lib.mdDoc "Back up vault warden instance");
-
-      backup_dir = lib.mkOption {
-        type = lib.types.path;
-        default = "/Aurora/Backups/Vaultwarden";
-        description = lib.mdDoc ''
-          The path where vaultwarden backups are put
-        '';
-      };
-    };
 
     nextcloud = {
-      enable = lib.mkEnableOption (lib.mkDoc "Back up nextcloud instance");
       root_dir = lib.mkOption {
         type = lib.types.path;
         default = /Aurora/nextcloud;
@@ -122,10 +91,8 @@ in
       description = "Alaska Nightly Backup Service";
       onFailure = [ "alaska_backup_script_onfail.service" ];
       path = with pkgs; [
-        gawk
         config.services.nextcloud.occ 
         config.services.postgresql.package
-        config.services.gitea.package
         rsync
         mount 
         umount
@@ -139,58 +106,24 @@ in
           echo "Mounting the external backup drive"
           mount /dev/disk/by-label/${cfg.backup1_drive_label} ${builtins.toString cfg.tmp_mount_point} -t ntfs3
 
-          #------ BEGIN NEXTCLOUD
+          echo "Puttin nextcloud into maintenance mode so that changes cannot happen during the backup"
-          if [ "${builtins.toString cfg.nextcloud.enable}" = "1" ]; then 
+          nextcloud-occ maintenance:mode --on
-            echo "Putting nextcloud into maintenance mode so that changes cannot happen during the backup"
-            nextcloud-occ maintenance:mode --on
 
-            echo "Backing up the nextcloud database"
+          echo "Backing up the nextcloud database"
-            mkdir -p ${builtins.toString cfg.tmp_mount_point}/nextcloud/db_backups
+          password='cat ${builtins.toString cfg.nextcloud.db_passfile}'
-            password='cat ${builtins.toString cfg.nextcloud.db_passfile}'
+          PGPASSWORD="$password" pg_dump \
-            PGPASSWORD="$password" pg_dump \
+          ${builtins.toString cfg.nextcloud.db_name} -h ${builtins.toString cfg.nextcloud.db_server} \
-              ${builtins.toString cfg.nextcloud.db_name} -h ${builtins.toString cfg.nextcloud.db_server} \
+          -U ${builtins.toString cfg.nextcloud.db_user} \
-              -U ${builtins.toString cfg.nextcloud.db_user} \
+          -f ${builtins.toString cfg.tmp_mount_point}/nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
-              -f ${builtins.toString cfg.tmp_mount_point}/nextcloud/db_backups/nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
 
-            echo "Backing up the nextcloud files"
+          echo "Backing up the nextcloud files"
-            # -a archive | -v verbose
+          # -a archive | -v verbose
-            rsync -av ${builtins.toString cfg.nextcloud.root_dir} \
+          rsync -av ${builtins.toString cfg.nextcloud.root_dir} \
-              ${builtins.toString cfg.tmp_mount_point}/nextcloud \
+            ${builtins.toString cfg.tmp_mount_point}/nextcloud \
-              --exclude '*/appdata_*' --exclude "*/files_trashbin/*" --exclude "*/files_versions/*"
+            --exclude '*/appdata_*' --exclude "*/files_trashbin/*" --exclude "*/files_versions/*"
 
-            echo "Ending nextcloud maintenance mode so that normal operations can resume"
+          echo "Get nextcloud out of maintenance mode so that normal operations can resume"
-            nextcloud-occ maintenance:mode --off
+          nextcloud-occ maintenance:mode --off
-          fi
-          #---- END NEXTCLOUD
-
-          #---- BEGIN FORGEJO
-          if [ "${builtins.toString cfg.forgejo.enable}" = "1" ]; then
-            echo "deleting old Forgejo backups"
-            find ${builtins.toString cfg.tmp_mount_point}/Forgejo -type f -printf '%T+ %p\n' \
-              | sort | head -n -${builtins.toString cfg.forgejo.save_old_count} \
-              | gawk '{print $2}' \
-              | xargs rm || true
-
-            echo "Copying Forgejo backup"
-            latest_backup=$(find ${builtins.toString cfg.forgejo.backups_dir} -type f -printf '%T+ %p\n' \
-              | grep .${builtins.toString config.services.gitea.dump.type} \
-              | sort | head -n 1 | gawk '{print $2}')
-            cp "$latest_backup" ${builtins.toString cfg.tmp_mount_point}/Forgejo
-                    
-            echo "Clearing old Forgejo backups"
-            find ${builtins.toString cfg.forgejo.backups_dir} -type f -printf '%T+ %p\n'\
-              | sort | head -n -${builtins.toString cfg.forgejo.save_old_count}\
-              | gawk '{print $2}'\
-              | xargs rm || true
-            fi
-          #----- END FORGEJO
-
-          #----- BEGIN VAULTWARDEN
-          if [ "${builtins.toString cfg.vaultwarden.enable}" = "1" ]; then
-            rsync -av ${cfg.vaultwarden.backup_dir} ${builtins.toString cfg.tmp_mount_point}
-
-          fi
-          #----- END VAULTWARDEN
 
           echo "Unmounting the external drive"
           umount ${builtins.toString cfg.tmp_mount_point}
@@ -198,7 +131,7 @@ in
           echo "Job completed"
           # "
       '';
-      startAt = "Sun 02:00:00"; # equvalent of OnCalendar
+      startAt = "Sun 14:00:00";
 
       # serviceConfig = {
         # Type = "oneshot";

hosts/Alaska/modules/forgejo.nix

@@ -17,13 +17,6 @@ in
     customDir = "/Aurora/Forgejo/custom";
     appName = "Nickiel's Repos";
 
-    dump = {
-      enable = true;
-      backupDir = "/Aurora/Backups/Forgejo";
-      # file = "gitea-backup.zip";
-      interval = "01:25";
-    };
-
     settings = {
 
       "ui" = {