diff --git a/modules/system/services/actualbudget/backups.nix b/modules/system/services/actualbudget/backups.nix index efaeadd..5912804 100644 --- a/modules/system/services/actualbudget/backups.nix +++ b/modules/system/services/actualbudget/backups.nix @@ -30,8 +30,6 @@ in custom.services.resticBackups.actual = { inherit user; - healthchecks.enable = true; - extraConfig = { backupPrepareCommand = "${lib.getExe' pkgs.systemd "systemctl"} stop actual.service"; backupCleanupCommand = "${lib.getExe' pkgs.systemd "systemctl"} start actual.service"; diff --git a/modules/system/services/forgejo/backups.nix b/modules/system/services/forgejo/backups.nix index 7ce3525..e4a22bf 100644 --- a/modules/system/services/forgejo/backups.nix +++ b/modules/system/services/forgejo/backups.nix @@ -30,8 +30,6 @@ in custom.services.resticBackups.forgejo = { inherit user; - healthchecks.enable = true; - extraConfig = { backupPrepareCommand = "${lib.getExe' pkgs.systemd "systemctl"} stop forgejo.service"; backupCleanupCommand = "${lib.getExe' pkgs.systemd "systemctl"} start forgejo.service"; diff --git a/modules/system/services/hedgedoc/backups.nix b/modules/system/services/hedgedoc/backups.nix index 70f9a20..ae7bdca 100644 --- a/modules/system/services/hedgedoc/backups.nix +++ b/modules/system/services/hedgedoc/backups.nix @@ -30,8 +30,6 @@ in custom.services.resticBackups.hedgedoc = { inherit user; - healthchecks.enable = true; - extraConfig = { backupPrepareCommand = "${lib.getExe' pkgs.systemd "systemctl"} stop hedgedoc.service"; backupCleanupCommand = "${lib.getExe' pkgs.systemd "systemctl"} start hedgedoc.service"; diff --git a/modules/system/services/nextcloud/backups.nix b/modules/system/services/nextcloud/backups.nix index 5cc55fe..967d318 100644 --- a/modules/system/services/nextcloud/backups.nix +++ b/modules/system/services/nextcloud/backups.nix @@ -16,8 +16,6 @@ in config = lib.mkIf cfg.backups.enable { custom.services.resticBackups.nextcloud = { inherit user; - healthchecks.enable = true; - extraConfig = { backupPrepareCommand = '' ${lib.getExe' config.services.nextcloud.occ "nextcloud-occ"} maintenance:mode --on diff --git a/modules/system/services/restic-backups/healthchecks.nix b/modules/system/services/restic-backups/healthchecks.nix index be105f4..1ee0b0d 100644 --- a/modules/system/services/restic-backups/healthchecks.nix +++ b/modules/system/services/restic-backups/healthchecks.nix @@ -16,16 +16,15 @@ in options.custom.services.resticBackups = lib.mkOption { type = lib.types.attrsOf ( lib.types.submodule { - options.healthchecks.enable = lib.mkEnableOption ""; + options.healthchecks.enable = lib.mkEnableOption "" // { + default = true; + }; } ); }; config = lib.mkIf (resticBackups != { }) { - sops.secrets."healthchecks-ping-key" = { - mode = "440"; - group = config.users.groups.backup.name; - }; + sops.secrets."healthchecks-ping-key" = { }; systemd.services = lib.mkMerge [ { diff --git a/modules/system/services/syncthing/backups.nix b/modules/system/services/syncthing/backups.nix index 28932ae..8c22535 100644 --- a/modules/system/services/syncthing/backups.nix +++ b/modules/system/services/syncthing/backups.nix @@ -39,8 +39,6 @@ in custom.services.resticBackups.syncthing = { inherit user; - healthchecks.enable = true; - extraConfig = { backupPrepareCommand = "${lib.getExe' pkgs.systemd "systemctl"} stop syncthing.service"; backupCleanupCommand = "${lib.getExe' pkgs.systemd "systemctl"} start syncthing.service";