diff --git a/modules/blocks/postgresql.nix b/modules/blocks/postgresql.nix index 4bb1ea5..7472255 100644 --- a/modules/blocks/postgresql.nix +++ b/modules/blocks/postgresql.nix @@ -55,6 +55,7 @@ in Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.databasebackup.mkRequester { user = "postgres"; @@ -169,10 +170,5 @@ in (upgrade-script 15 16) ]; } - { - # Seems superfluous but otherwise we get: - # The option `shb.postgresql.databasebackup' was accessed but has no value defined. - shb.postgresql.databasebackup = {}; - } ]); } diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 3d5b1cb..7399132 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -244,6 +244,7 @@ in description = '' Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.backup.mkRequester { user = options.services.forgejo.user.value; diff --git a/modules/services/home-assistant.nix b/modules/services/home-assistant.nix index 8f2189f..fa12881 100644 --- a/modules/services/home-assistant.nix +++ b/modules/services/home-assistant.nix @@ -143,6 +143,7 @@ in description = '' Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.backup.mkRequester { user = "hass"; diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix index adaeef8..975d5dc 100644 --- a/modules/services/jellyfin.nix +++ b/modules/services/jellyfin.nix @@ -154,6 +154,7 @@ in description = '' Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.backup.mkRequester { user = "jellyfin"; diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix index c0fed18..084d050 100644 --- a/modules/services/nextcloud-server.nix +++ b/modules/services/nextcloud-server.nix @@ -522,6 +522,7 @@ in description = '' Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.backup.mkRequester { user = "nextcloud"; diff --git a/modules/services/vaultwarden.nix b/modules/services/vaultwarden.nix index 09415ab..83cf52a 100644 --- a/modules/services/vaultwarden.nix +++ b/modules/services/vaultwarden.nix @@ -131,6 +131,7 @@ in description = '' Backup configuration. ''; + default = {}; type = lib.types.submodule { options = contracts.backup.mkRequester { user = "vaultwarden"; @@ -231,9 +232,5 @@ in # TODO: make this work. # It does not work because it leads to infinite recursion. # ${cfg.mount}.path = dataFolder; - - # Seems superfluous but otherwise we get: - # The option `shb.vaultwarden.backup' was accessed but has no value defined. - shb.vaultwarden.backup = {}; }; }