diff --git a/flake.nix b/flake.nix index 7609a0a..7190525 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,10 @@ networking.firewall.interfaces."enp7s0".allowedTCPPorts = [ 5432 ]; services.custom-backup-job = { additionalReadWritePaths = [ "/nix/var/data/postgresql" ]; - additionalPreHook = "${pkgs.postgresql_12}/bin/pg_dump -U synapse synapse > /nix/var/data/postgresql/synapse.dmp"; + additionalPreHook = '' + ${pkgs.postgresql_12}/bin/pg_dump -U synapse synapse > /nix/var/data/postgresql/synapse.dmp + ${pkgs.postgresql_12}/bin/pg_dump -U nextcloud nextcloud > /nix/var/data/postgresql/nextcloud.dmp + ''; startAt = "03:00"; }; }) @@ -54,6 +57,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 64738 ]; networking.firewall.allowedUDPPorts = [ 64738 ]; services.custom-backup-job = { + additionalPaths = [ "/var/lib/nextcloud/config" ]; additionalReadWritePaths = [ "/nix/var/data/murmur" ]; additionalPreHook = "cp /var/lib/murmur/murmur.sqlite /nix/var/data/murmur/murmur.sqlite"; startAt = "03:30"; diff --git a/modules/custom-backup-job.nix b/modules/custom-backup-job.nix index 30fbf42..369da6a 100644 --- a/modules/custom-backup-job.nix +++ b/modules/custom-backup-job.nix @@ -5,6 +5,11 @@ let in { options.services.custom-backup-job = { + additionalPaths = mkOption { + type = with types; listOf path; + default = [ ]; + }; + additionalReadWritePaths = mkOption { type = with types; listOf path; default = [ ]; @@ -23,7 +28,7 @@ in config = { services.borgbackup.jobs.data = { - paths = [ "/nix/var/data" ]; + paths = [ "/nix/var/data" ] ++ cfg.additionalPaths; doInit = false; repo = "backup@212.129.12.205:./"; encryption = { diff --git a/roles/daily-backup/templates/fullBackup.sh b/roles/daily-backup/templates/fullBackup.sh index a40f9e3..4fed89e 100755 --- a/roles/daily-backup/templates/fullBackup.sh +++ b/roles/daily-backup/templates/fullBackup.sh @@ -7,8 +7,8 @@ REPOSITORY=ssh://backup@212.129.12.205:22/./ export BORG_PASSPHRASE='{{backup_borg_passphrase}}' -echo 'Dumping NextCloud database' -docker exec nextcloud_postgres_1 sh -c "pg_dump -U nextcloud nextcloud > /backups/database.dmp" +#echo 'Dumping NextCloud database' +#docker exec nextcloud_postgres_1 sh -c "pg_dump -U nextcloud nextcloud > /backups/database.dmp" echo 'Dumping S.T.B. wordpress database' docker exec stb_db_1 sh -c "mysqldump -u stb -p{{stb_mysql_password}} stb > /backups/database.dmp"