Add other backup profiles to ovh backend

diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index c8ee48e980c37add026f9f4e4ebd5be72a4b30a9..3dc6a044acf8933996e811e0ac9001c2416c2540 100644 (file)
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -26,6 +26,7 @@ in
   config = lib.mkIf config.myServices.buildbot.enable {
     services.duplyBackup.profiles.buildbot = {
       rootDir = varDir;
   config = lib.mkIf config.myServices.buildbot.enable {
     services.duplyBackup.profiles.buildbot = {
       rootDir = varDir;

+      remotes = [ "eriomem" "ovh" ];

     };
     ids.uids.buildbot = config.myEnv.buildbot.user.uid;
     ids.gids.buildbot = config.myEnv.buildbot.user.gid;
     };
     ids.uids.buildbot = config.myEnv.buildbot.user.uid;
     ids.gids.buildbot = config.myEnv.buildbot.user.gid;

diff --git a/modules/private/ftp.nix b/modules/private/ftp.nix
index 8ae4e650bb41facba3047842f05c8a68382ffc32..233031a05ed335534dca26303e82927da2602b18 100644 (file)
--- a/modules/private/ftp.nix
+++ b/modules/private/ftp.nix
@@ -16,6 +16,7 @@ in
   config = lib.mkIf config.services.pure-ftpd.enable {
     services.duplyBackup.profiles.ftp = {
       rootDir = "/var/lib/ftp";
   config = lib.mkIf config.services.pure-ftpd.enable {
     services.duplyBackup.profiles.ftp = {
       rootDir = "/var/lib/ftp";

+      remotes = [ "eriomem" "ovh" ];

     };
     security.acme.certs."ftp" = config.myServices.certificates.certConfig // {
       domain = "eldiron.immae.eu";
     };
     security.acme.certs."ftp" = config.myServices.certificates.certConfig // {
       domain = "eldiron.immae.eu";

diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix
index e8ccc7d67777ffc15e6cb654c478e7568275ba6c..6b573e3931bbee97ae9fd21f5191b480530cb232 100644 (file)
--- a/modules/private/gitolite/default.nix
+++ b/modules/private/gitolite/default.nix
@@ -17,6 +17,7 @@ in {
     }];
     services.duplyBackup.profiles.gitolite = {
       rootDir = cfg.gitoliteDir;
     }];
     services.duplyBackup.profiles.gitolite = {
       rootDir = cfg.gitoliteDir;

+      remotes = [ "eriomem" "ovh" ];

     };
     networking.firewall.allowedTCPPorts = [ 9418 ];
 
     };
     networking.firewall.allowedTCPPorts = [ 9418 ];
 

diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix
index 57fc75ce376707c78a913e711f4b947f09790425..9e68cc91f06c8271be93abcaf8b92c2dce0d88b8 100644 (file)
--- a/modules/private/mail/default.nix
+++ b/modules/private/mail/default.nix
@@ -37,6 +37,7 @@
     };
     services.duplyBackup.profiles = {
       mail = {
     };
     services.duplyBackup.profiles = {
       mail = {

+        remotes = [ "eriomem" "ovh" ];

         rootDir = "/var/lib";
         excludeFile = lib.mkAfter ''
           + /var/lib/vhost
         rootDir = "/var/lib";
         excludeFile = lib.mkAfter ''
           + /var/lib/vhost

diff --git a/modules/private/monitoring/plugins/check_backup_age b/modules/private/monitoring/plugins/check_backup_age
index 4d03b8270ed7603fc12e24e041f2e38abe180e09..d873bdc4ea1814bddc4ecc72cd120afad4d0295e 100755 (executable)
--- a/modules/private/monitoring/plugins/check_backup_age
+++ b/modules/private/monitoring/plugins/check_backup_age
@@ -17,8 +17,8 @@ output=$(duplicity collection-status --log-fd 2 "$BASE_URL$folder" 2>&1 > /dev/n
 
 output=$(echo "$output" | grep -v "^\.")
 
 
 output=$(echo "$output" | grep -v "^\.")
 

-last_full=$(parse_date $(echo "$output" | grep "^ full " | cut -d' ' -f3 | sort | tail -n1))
-last_bkp=$(parse_date $(echo "$output" | grep -E "^ (full|inc) " | cut -d' ' -f3 | sort | tail -n1))
+last_full=$(parse_date "$(echo "$output" | grep "^ full " | cut -d' ' -f3 | sort | tail -n1)")
+last_bkp=$(parse_date "$(echo "$output" | grep -E "^ (full|inc) " | cut -d' ' -f3 | sort | tail -n1)")

 orphaned_sets=$(echo "$output" | grep "^orphaned-sets-num" | cut -d' ' -f2)
 incomplete_sets=$(echo "$output" | grep "^incomplete-sets-num" | cut -d' ' -f2)
 
 orphaned_sets=$(echo "$output" | grep "^orphaned-sets-num" | cut -d' ' -f2)
 incomplete_sets=$(echo "$output" | grep "^incomplete-sets-num" | cut -d' ' -f2)
 

diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix
index 4fe41152d8cf4259bce8495add0f17d36f320b3d..5d2b19f27fa88d7affd70518961155f53ab10161 100644 (file)
--- a/modules/private/websites/tools/diaspora/default.nix
+++ b/modules/private/websites/tools/diaspora/default.nix
@@ -12,6 +12,7 @@ in {
   config = lib.mkIf cfg.enable {
     services.duplyBackup.profiles.diaspora = {
       rootDir = dcfg.dataDir;
   config = lib.mkIf cfg.enable {
     services.duplyBackup.profiles.diaspora = {
       rootDir = dcfg.dataDir;

+      remotes = [ "eriomem" "ovh" ];

     };
     users.users.diaspora.extraGroups = [ "keys" ];
 
     };
     users.users.diaspora.extraGroups = [ "keys" ];
 

diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index 5290a96f4c8388ef8e6802f1f9ab4ee5252b15ff..6175a68e7e503b5323895c3d7f739d7a29008008 100644 (file)
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -2,6 +2,7 @@
 rec {
   backups = {
     rootDir = varDir;
 rec {
   backups = {
     rootDir = varDir;

+    remotes = [ "eriomem" "ovh" ];

   };
   varDir = "/var/lib/dokuwiki";
   activationScript = {
   };
   varDir = "/var/lib/dokuwiki";
   activationScript = {

diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix
index 00e2dc9c00df80f300625063e7734ac34166cde3..1cb064551af9f77d54d614b3ff82540789433546 100644 (file)
--- a/modules/private/websites/tools/tools/wallabag.nix
+++ b/modules/private/websites/tools/tools/wallabag.nix
@@ -2,6 +2,7 @@
 rec {
   backups = {
     rootDir = varDir;
 rec {
   backups = {
     rootDir = varDir;

+    remotes = [ "eriomem" "ovh" ];

   };
   varDir = "/var/lib/wallabag";
   keys = [{
   };
   varDir = "/var/lib/wallabag";
   keys = [{