4 files changed, 22 insertions, 8 deletions

diff --git a/systems/backup-2/databases/mariadb_replication.nix b/systems/backup-2/databases/mariadb_replication.nix
index f113219..c085682 100644
--- a/systems/backup-2/databases/mariadb_replication.nix
+++ b/systems/backup-2/databases/mariadb_replication.nix
@@ -163,6 +163,9 @@ in
                 --flush-privileges \
                 --all-databases > $filename
               ${pkgs.gzip}/bin/gzip $filename
+
+              mkdir -p "${cfg.base}/${name}/databases_latest_backups"
+              ln -f "$filename.gz" "${cfg.base}/${name}/databases_latest_backups/mysql.sql.gz"
             '';
           u = pkgs.callPackage ./utils.nix {};
           cleanup_script = pkgs.writeScript "cleanup_mysql_${name}" (u.exponentialDumps "sql.gz" backupDir);
@@ -194,7 +197,7 @@ in
       }
     ) cfg.hosts;
 
-    environment.systemPackages = lib.mapAttrsToList (name: hcfg:
+    environment.systemPackages = [ pkgs.mariadb ] ++ lib.mapAttrsToList (name: hcfg:
       pkgs.writeScriptBin "mysql_backup_${name}" ''
         #!${pkgs.stdenv.shell}
 
diff --git a/systems/backup-2/databases/openldap_replication.nix b/systems/backup-2/databases/openldap_replication.nix
index b962224..d3cda1c 100644
--- a/systems/backup-2/databases/openldap_replication.nix
+++ b/systems/backup-2/databases/openldap_replication.nix
@@ -121,7 +121,11 @@ in
           backup_script = pkgs.writeScript "backup_openldap_${name}" ''
               #!${pkgs.stdenv.shell}
 
-              ${hcfg.package}/bin/slapcat -b "${hcfg.base}" -f ${ldapConfig hcfg name} -l ${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).ldif
+              filename="${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).ldif"
+              ${hcfg.package}/bin/slapcat -b "${hcfg.base}" -f ${ldapConfig hcfg name} -l "$filename"
+
+              mkdir -p "${cfg.base}/${name}/databases_latest_backups"
+              ln -f "$filename" "${cfg.base}/${name}/databases_latest_backups/openldap.ldif"
             '';
           u = pkgs.callPackage ./utils.nix {};
           cleanup_script = pkgs.writeScript "cleanup_openldap_${name}" (u.exponentialDumps "ldif" backupDir);
diff --git a/systems/backup-2/databases/postgresql_replication.nix b/systems/backup-2/databases/postgresql_replication.nix
index 5351a4f..b428533 100644
--- a/systems/backup-2/databases/postgresql_replication.nix
+++ b/systems/backup-2/databases/postgresql_replication.nix
@@ -127,19 +127,23 @@ in
               set -euo pipefail
 
               resume_replication() {
-                ${hcfg.package}/bin/psql -h ${dataDir} -c "SELECT pg_wal_replay_resume();" >/dev/null || echo "impossible to resume replication"
+                sudo -u postgres ${hcfg.package}/bin/psql -h ${dataDir} -c "SELECT pg_wal_replay_resume();" >/dev/null || echo "impossible to resume replication"
               }
 
               trap resume_replication EXIT
 
-              ${hcfg.package}/bin/psql -h ${dataDir} -c "SELECT pg_wal_replay_pause();" >/dev/null || (echo "impossible to pause replication" && false)
+              sudo -u postgres ${hcfg.package}/bin/psql -h ${dataDir} -c "SELECT pg_wal_replay_pause();" >/dev/null || (echo "impossible to pause replication" && false)
 
-              ${hcfg.package}/bin/pg_dumpall -h ${dataDir} -f ${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).sql
+              filename=${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).sql
+              sudo -u postgres ${hcfg.package}/bin/pg_dumpall -h ${dataDir} -f "$filename"
+
+              mkdir -p "${cfg.base}/${name}/databases_latest_backups"
+              ln -f "$filename" "${cfg.base}/${name}/databases_latest_backups/postgresql.sql"
             '';
           u = pkgs.callPackage ./utils.nix {};
           cleanup_script = pkgs.writeScript "cleanup_postgresql_${name}" (u.keepLastNDumps "sql" backupDir 6);
         in [
-          "0 22,4,10,16 * * * postgres ${backup_script}"
+          "0 22,4,10,16 * * * root ${backup_script}"
           "0 3 * * * postgres ${cleanup_script}"
         ]) cfg.hosts);
     };
diff --git a/systems/backup-2/databases/redis_replication.nix b/systems/backup-2/databases/redis_replication.nix
index 53fa904..1088630 100644
--- a/systems/backup-2/databases/redis_replication.nix
+++ b/systems/backup-2/databases/redis_replication.nix
@@ -114,8 +114,11 @@ in
           backup_script = pkgs.writeScript "backup_redis_${name}" ''
               #!${pkgs.stdenv.shell}
 
-              ${pkgs.coreutils}/bin/cp ${cfg.base}/${name}/redis/dump.rdb \
-                ${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).rdb
+              filename="${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).rdb"
+              ${pkgs.coreutils}/bin/cp ${cfg.base}/${name}/redis/dump.rdb "$filename"
+
+              mkdir -p "${cfg.base}/${name}/databases_latest_backups"
+              ln -f "$filename" "${cfg.base}/${name}/databases_latest_backups/redis.rdb"
             '';
           u = pkgs.callPackage ./utils.nix {};
           cleanup_script = pkgs.writeScript "cleanup_redis_${name}" (u.exponentialDumps "rdb" backupDir);