diff --git a/modules/system/services/actualbudget/backups.nix b/modules/system/services/actualbudget/backups.nix index 6f25d22..ecaa677 100644 --- a/modules/system/services/actualbudget/backups.nix +++ b/modules/system/services/actualbudget/backups.nix @@ -4,7 +4,7 @@ config = lib.mkIf config.custom.services.actualbudget.backups.enable { custom.services.resticBackups.actual = { - dependentService = "actual.service"; + conflictingService = "actual.service"; extraConfig.paths = [ config.services.actual.settings.dataDir ]; }; }; diff --git a/modules/system/services/forgejo/backups.nix b/modules/system/services/forgejo/backups.nix index 3a5e8d8..67e53a6 100644 --- a/modules/system/services/forgejo/backups.nix +++ b/modules/system/services/forgejo/backups.nix @@ -4,7 +4,7 @@ config = lib.mkIf config.custom.services.forgejo.backups.enable { custom.services.resticBackups.forgejo = { - dependentService = "forgejo.service"; + conflictingService = "forgejo.service"; extraConfig.paths = [ config.services.forgejo.stateDir ]; }; }; diff --git a/modules/system/services/hedgedoc/backups.nix b/modules/system/services/hedgedoc/backups.nix index 8b21280..7d9b8f5 100644 --- a/modules/system/services/hedgedoc/backups.nix +++ b/modules/system/services/hedgedoc/backups.nix @@ -4,7 +4,7 @@ config = lib.mkIf config.custom.services.hedgedoc.backups.enable { custom.services.resticBackups.hedgedoc = { - dependentService = "hedgedoc.service"; + conflictingService = "hedgedoc.service"; extraConfig.paths = with config.services.hedgedoc.settings; [ uploadsPath db.storage diff --git a/modules/system/services/restic-backups/default.nix b/modules/system/services/restic-backups/default.nix index f013609..e392035 100644 --- a/modules/system/services/restic-backups/default.nix +++ b/modules/system/services/restic-backups/default.nix @@ -1,8 +1,6 @@ { config, lib, ... }: let resticBackups = lib.filterAttrs (_: value: value.enable) config.custom.services.resticBackups; - - # user = config.users.users.restic.name; in { options.custom.services.resticBackups = lib.mkOption { @@ -12,7 +10,7 @@ in enable = lib.mkEnableOption "" // { default = true; }; - dependentService = lib.mkOption { + conflictingService = lib.mkOption { type = lib.types.nullOr lib.types.nonEmptyStr; default = null; }; @@ -38,7 +36,6 @@ in name: value: lib.mkMerge [ { - #inherit user; initialize = true; repository = "s3:https://s3.eu-central-003.backblazeb2.com/stork-atlas/${name}"; environmentFile = config.sops.secrets."restic/environment".path; @@ -63,11 +60,11 @@ in |> lib.mapAttrs' ( name: value: lib.nameValuePair "restic-backups-${name}" ( - lib.mkIf (value.dependentService != null) { - unitConfig.Conflicts = [ value.dependentService ]; - after = [ value.dependentService ]; - onSuccess = [ value.dependentService ]; - onFailure = [ value.dependentService ]; + lib.mkIf (value.conflictingService != null) { + unitConfig.Conflicts = [ value.conflictingService ]; + after = [ value.conflictingService ]; + onSuccess = [ value.conflictingService ]; + onFailure = [ value.conflictingService ]; } ) ); diff --git a/modules/system/services/restic-backups/restore.nix b/modules/system/services/restic-backups/restore.nix index ed59c73..14edaf9 100644 --- a/modules/system/services/restic-backups/restore.nix +++ b/modules/system/services/restic-backups/restore.nix @@ -40,15 +40,15 @@ in name = "restic-restore-${name}"; text = let - inherit (value) dependentService; - hasDependentService = dependentService != null; + inherit (value) conflictingService; + hasconflictingService = conflictingService != null; in '' - ${lib.optionalString hasDependentService "systemctl stop ${dependentService}"} + ${lib.optionalString hasconflictingService "systemctl stop ${conflictingService}"} ${value.restoreCommand.preRestore} restic-${name} restore latest --target / ${value.restoreCommand.postRestore} - ${lib.optionalString hasDependentService "systemctl start ${dependentService}"} + ${lib.optionalString hasconflictingService "systemctl start ${conflictingService}"} ''; } ); diff --git a/modules/system/services/syncthing/backups.nix b/modules/system/services/syncthing/backups.nix index b741035..0449c60 100644 --- a/modules/system/services/syncthing/backups.nix +++ b/modules/system/services/syncthing/backups.nix @@ -14,7 +14,7 @@ in ]; custom.services.resticBackups.syncthing = { - dependentService = "syncthing.service"; + conflictingService = "syncthing.service"; extraConfig.paths = [ config.services.syncthing.dataDir ]; }; }; diff --git a/modules/system/services/uptime-kuma/backups.nix b/modules/system/services/uptime-kuma/backups.nix index 892d1e1..228e627 100644 --- a/modules/system/services/uptime-kuma/backups.nix +++ b/modules/system/services/uptime-kuma/backups.nix @@ -5,7 +5,7 @@ config = lib.mkIf config.custom.services.uptimeKuma.backups.enable { custom.services.resticBackups.uptime-kuma = { healthchecks.enable = false; - dependentService = "uptime-kuma.service"; + conflictingService = "uptime-kuma.service"; extraConfig.paths = [ "/var/lib/private/uptime-kuma" ]; }; };