gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use externalPath (#460102)

Browse Source
This commit is contained in:
Felix Bühler
2025-11-10 20:49:26 +00:00
committed by GitHub
parent 5046a3a40f 5949a18871
commit 73822fdf03
11 changed files with 16 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/backup/pgbackrest.nix
+2 -8
View File
@@ -83,10 +83,7 @@ let
secretPathOption =
with lib.types;
lib.mkOption {
type = nullOr (pathWith {
inStore = false;
absolute = true;
});
type = nullOr externalPath;
default = null;
internal = true;
};
@@ -142,10 +139,7 @@ in
};
options.sftp-private-key-file = lib.mkOption {
type = nullOr (pathWith {
inStore = false;
absolute = true;
});
type = nullOr externalPath;
default = null;
description = ''
SFTP private key file.
nixos/modules/services/databases/postgres-websockets.nix
+2 -12
View File
@@ -31,12 +31,7 @@ in
enable = lib.mkEnableOption "postgres-websockets";
pgpassFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/db_password";
description = ''
@@ -54,12 +49,7 @@ in
};
jwtSecretFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
example = "/run/keys/jwt_secret";
description = ''
Secret used to sign JWT tokens used to open communications channels.
nixos/modules/services/databases/postgrest.nix
+2 -12
View File
@@ -54,12 +54,7 @@ in
enable = lib.mkEnableOption "PostgREST";
pgpassFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/db_password";
description = ''
@@ -77,12 +72,7 @@ in
};
jwtSecretFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/jwt_secret";
description = ''
nixos/modules/services/matrix/matrix-alertmanager.nix
+2 -8
View File
@@ -76,17 +76,11 @@ in
description = "Makes the bot mention @room when posting an alert";
};
tokenFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains a valid Matrix token for the Matrix user.";
};
secretFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains a secret for the Alertmanager webhook.";
};
};
nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix
+1 -4
View File
@@ -15,10 +15,7 @@ in
extraOpts = {
package = mkPackageOption pkgs "prometheus-storagebox-exporter" { };
tokenFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains the Hetzner API token to use.";
};
nixos/modules/services/networking/cloudflare-dyndns.nix
+1 -5
View File
@@ -15,11 +15,7 @@ in
package = lib.mkPackageOption pkgs "cloudflare-dyndns" { };
apiTokenFile = lib.mkOption {
type = lib.types.pathWith {
absolute = true;
inStore = false;
};
type = lib.types.externalPath;
description = ''
The path to a file containing the CloudFlare API token.
'';
nixos/modules/services/networking/syncthing.nix
+1 -6
View File
@@ -559,12 +559,7 @@ in
'';
};
encryptionPasswordFile = mkOption {
type = types.nullOr (
types.pathWith {
inStore = false;
absolute = true;
}
);
type = types.nullOr types.externalPath;
default = null;
description = ''
Path to encryption password. If set, the file will be read during
nixos/modules/services/security/step-ca.nix
+1 -6
View File
@@ -55,12 +55,7 @@ in
'';
};
intermediatePasswordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
example = "/run/keys/smallstep-password";
description = ''
nixos/modules/services/web-apps/librespeed.nix
+1 -8
View File
@@ -71,14 +71,7 @@ in
The contents of the specified paths will be read at service start time and merged with the attributes provided in `settings`.
'';
default = { };
type =
with lib.types;
nullOr (
attrsOf (pathWith {
inStore = false;
absolute = true;
})
);
type = with lib.types; nullOr (attrsOf externalPath);
};
settings = lib.mkOption {
nixos/modules/services/web-apps/oncall.nix
+1 -4
View File
@@ -78,10 +78,7 @@ in
};
secretFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
example = "/run/keys/oncall-dbpassword";
description = ''
A YAML file containing secrets such as database or user passwords.
nixos/modules/services/web-apps/photoprism.nix
+2 -12
View File
@@ -33,12 +33,7 @@ in
enable = lib.mkEnableOption "Photoprism web server";
passwordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
description = ''
Admin password file.
@@ -46,12 +41,7 @@ in
};
databasePasswordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
description = ''
Database password file.