diff --git a/secrets/default.nix b/secrets/default.nix index 59c9049..59df0a1 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -11,7 +11,7 @@ with lib; shadow-hashed-password-root = lib.fileContents ./shadow-hashed-password-root.secret; miniflux-admin-credentials = lib.fileContents ./miniflux-admin-credentials.secret; transmission-password = lib.fileContents ./transmission.secret; - nextcloud-admin-pass = lib.fileContents ./nextcloud-admin-pass.secret; + nextcloud-admin-pass = ./nextcloud-admin-pass.secret; nextcloud-admin-user = lib.fileContents ./nextcloud-admin-user.secret; lohr-shared-secret = lib.fileContents ./lohr-shared-secret.secret; gandiKey = lib.fileContents ./gandi-api-key.secret; diff --git a/services/nextcloud.nix b/services/nextcloud.nix index 3a8e793..799208e 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -58,7 +58,7 @@ in dbhost = "/run/postgresql"; adminuser = my.secrets.nextcloud-admin-user; - adminpass = my.secrets.nextcloud-admin-pass; + adminpassFile = "${my.secrets.nextcloud-admin-pass}"; }; }; diff --git a/services/restic-backup.nix b/services/restic-backup.nix index ccbe44e..e83fdbc 100644 --- a/services/restic-backup.nix +++ b/services/restic-backup.nix @@ -68,7 +68,7 @@ in { repository = cfg.repo; passwordFile = "/root/restic/password"; - s3CredentialsFile = "/root/restic/creds"; + environmentFile = "/root/restic/creds"; extraBackupArgs = [ "--verbose=2" ] ++ optional (builtins.length cfg.exclude != 0) excludeArg;