diff --git a/modules/system/services/restic-backups/default.nix b/modules/system/services/restic/backups.nix similarity index 86% rename from modules/system/services/restic-backups/default.nix rename to modules/system/services/restic/backups.nix index e31e7fe..3ed0af8 100644 --- a/modules/system/services/restic-backups/default.nix +++ b/modules/system/services/restic/backups.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - resticBackups = config.custom.services.resticBackups |> lib.filterAttrs (_: value: value.enable); + backups = config.custom.services.restic.backups |> lib.filterAttrs (_: value: value.enable); in { - options.custom.services.resticBackups = lib.mkOption { + options.custom.services.restic.backups = lib.mkOption { type = lib.types.attrsOf ( lib.types.submodule { options = { @@ -28,7 +28,7 @@ in default = { }; }; - config = lib.mkIf (resticBackups != { }) { + config = lib.mkIf (backups != { }) { sops = { secrets = { "backblaze/key-id" = { }; @@ -43,10 +43,10 @@ in }; systemd.tmpfiles.rules = - resticBackups |> lib.attrNames |> lib.map (name: "d /var/cache/restic-backups-${name} 700 - - -"); + backups |> lib.attrNames |> lib.map (name: "d /var/cache/restic-backups-${name} 700 - - -"); services.restic.backups = - resticBackups + backups |> lib.mapAttrs ( name: value: lib.mkMerge [ @@ -71,7 +71,7 @@ in ); systemd.services = - resticBackups + backups |> lib.mapAttrs' ( name: value: lib.nameValuePair "restic-backups-${name}" ( diff --git a/modules/system/services/restic-backups/healthchecks.nix b/modules/system/services/restic/healthchecks.nix similarity index 93% rename from modules/system/services/restic-backups/healthchecks.nix rename to modules/system/services/restic/healthchecks.nix index 6064d49..eb6eb03 100644 --- a/modules/system/services/restic-backups/healthchecks.nix +++ b/modules/system/services/restic/healthchecks.nix @@ -6,12 +6,12 @@ }: let backupsWithHealthchecks = - config.custom.services.resticBackups + config.custom.services.restic.backups |> lib.filterAttrs (_: value: value.enable) |> lib.filterAttrs (_: value: value.doHealthchecks); in { - options.custom.services.resticBackups = lib.mkOption { + options.custom.services.restic.backups = lib.mkOption { type = lib.types.attrsOf ( lib.types.submodule { options.doHealthchecks = lib.mkEnableOption "" // { diff --git a/modules/system/services/restic-backups/restore.nix b/modules/system/services/restic/restore.nix similarity index 93% rename from modules/system/services/restic-backups/restore.nix rename to modules/system/services/restic/restore.nix index e322b95..1c68e87 100644 --- a/modules/system/services/restic-backups/restore.nix +++ b/modules/system/services/restic/restore.nix @@ -6,12 +6,12 @@ }: let backupsWithRestoreCommand = - config.custom.services.resticBackups + config.custom.services.restic.backups |> lib.filterAttrs (_: value: value.enable) |> lib.filterAttrs (_: value: value.restoreCommand.enable); in { - options.custom.services.resticBackups = lib.mkOption { + options.custom.services.restic.backups = lib.mkOption { type = lib.types.attrsOf ( lib.types.submodule { options.restoreCommand = { diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index 291f5b9..ce8edf5 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -133,7 +133,7 @@ in }; custom = { - services.resticBackups.syncthing = lib.mkIf cfg.doBackups { + services.restic.backups.syncthing = lib.mkIf cfg.doBackups { conflictingService = "syncthing.service"; paths = [ dataDir ]; }; diff --git a/modules/system/web-services/actualbudget.nix b/modules/system/web-services/actualbudget.nix index 0413fc8..41f4aca 100644 --- a/modules/system/web-services/actualbudget.nix +++ b/modules/system/web-services/actualbudget.nix @@ -47,7 +47,7 @@ in }; custom = { - services.resticBackups.actual = lib.mkIf cfg.doBackups { + services.restic.backups.actual = lib.mkIf cfg.doBackups { conflictingService = "actual.service"; paths = [ dataDir ]; }; diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix index a9a9b1a..69d7ce1 100644 --- a/modules/system/web-services/filebrowser.nix +++ b/modules/system/web-services/filebrowser.nix @@ -53,7 +53,7 @@ in }; custom = { - services.resticBackups.filebrowser = lib.mkIf cfg.doBackups { + services.restic.backups.filebrowser = lib.mkIf cfg.doBackups { conflictingService = "filebrowser.service"; paths = [ dataDir ]; }; diff --git a/modules/system/web-services/forgejo/default.nix b/modules/system/web-services/forgejo/default.nix index 513728f..c9b575d 100644 --- a/modules/system/web-services/forgejo/default.nix +++ b/modules/system/web-services/forgejo/default.nix @@ -132,7 +132,7 @@ in ''; custom = { - services.resticBackups.forgejo = lib.mkIf cfg.doBackups { + services.restic.backups.forgejo = lib.mkIf cfg.doBackups { conflictingService = "forgejo.service"; paths = [ config.services.forgejo.stateDir ]; }; diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix index 621f37f..b9368d4 100644 --- a/modules/system/web-services/memos.nix +++ b/modules/system/web-services/memos.nix @@ -55,7 +55,7 @@ in }; custom = { - services.resticBackups.memos = lib.mkIf cfg.doBackups { + services.restic.backups.memos = lib.mkIf cfg.doBackups { conflictingService = "memos.service"; paths = [ dataDir ]; }; diff --git a/modules/system/web-services/outline.nix b/modules/system/web-services/outline.nix index 3cb6303..4607344 100644 --- a/modules/system/web-services/outline.nix +++ b/modules/system/web-services/outline.nix @@ -73,7 +73,7 @@ in inherit (config.services.outline) user; in { - services.resticBackups.outline = lib.mkIf cfg.doBackups { + services.restic.backups.outline = lib.mkIf cfg.doBackups { conflictingService = "outline.service"; paths = [ dataDir ]; extraConfig.backupPrepareCommand = '' diff --git a/modules/system/web-services/radicale.nix b/modules/system/web-services/radicale.nix index 1e7b1b1..91382ef 100644 --- a/modules/system/web-services/radicale.nix +++ b/modules/system/web-services/radicale.nix @@ -107,7 +107,7 @@ in ); custom = { - services.resticBackups.radicale = lib.mkIf cfg.doBackups { + services.restic.backups.radicale = lib.mkIf cfg.doBackups { conflictingService = "radicale.service"; paths = [ dataDir ]; };