From df61b815efe9ae03f3430c7d2768c4f6817fca28 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Sun, 10 Nov 2024 21:21:58 +0100 Subject: [PATCH] update documentation --- docs/default.nix | 5 ++++- modules/blocks/restic.nix | 12 ++++++------ modules/blocks/restic/dummyModule.nix | 8 ++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 modules/blocks/restic/dummyModule.nix diff --git a/docs/default.nix b/docs/default.nix index b76fed5..cc0fe25 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -135,7 +135,10 @@ in stdenv.mkDerivation { substituteInPlace ./modules/blocks/restic/docs/default.md \ --replace \ '@OPTIONS_JSON@' \ - ${individualModuleOptionsDocs [ ../modules/blocks/restic.nix ]}/share/doc/nixos/options.json + ${individualModuleOptionsDocs [ + ../modules/blocks/restic.nix + ../modules/blocks/restic/dummyModule.nix + ]}/share/doc/nixos/options.json substituteInPlace ./modules/services/nextcloud-server/docs/default.md \ --replace \ diff --git a/modules/blocks/restic.nix b/modules/blocks/restic.nix index cc1cc18..cfae6d5 100644 --- a/modules/blocks/restic.nix +++ b/modules/blocks/restic.nix @@ -100,7 +100,7 @@ in instances = mkOption { description = "Each instance is backing up some directories to one repository."; default = {}; - type = attrsOf (submodule ({ name, config, ... }: { + type = attrsOf (submodule ({ name, options, ... }: { options = { request = mkOption { type = contracts.backup.request; @@ -113,8 +113,8 @@ in result = mkOption { type = contracts.databasebackup.result; default = { - restoreScript = fullName name config.settings.repository; - backupService = "${fullName name config.settings.repository}.service"; + restoreScript = fullName name options.settings.value.repository; + backupService = "${fullName name options.settings.value.repository}.service"; }; }; }; @@ -124,7 +124,7 @@ in databases = mkOption { description = "Each item is backing up some database to one repository."; default = {}; - type = attrsOf (submodule ({ name, config, ... }: { + type = attrsOf (submodule ({ name, options, ... }: { options = { request = mkOption { type = contracts.databasebackup.request; @@ -137,8 +137,8 @@ in result = mkOption { type = contracts.databasebackup.result; default = { - restoreScript = fullName name config.settings.repository; - backupService = "${fullName name config.settings.repository}.service"; + restoreScript = fullName name options.settings.value.repository; + backupService = "${fullName name (lib.debug.traceValSeqN 2 (lib.debug.traceValSeqN 2 (lib.debug.traceValSeqN 2 options).settings).value).repository}.service"; }; }; }; diff --git a/modules/blocks/restic/dummyModule.nix b/modules/blocks/restic/dummyModule.nix new file mode 100644 index 0000000..7d39c1d --- /dev/null +++ b/modules/blocks/restic/dummyModule.nix @@ -0,0 +1,8 @@ +{ lib, ... }: +{ + config = { + shb.restic.databases."".settings = { + repository = ""; + }; + }; +}