diff options
author | Aaron Andersen <aaron@fosslib.net> | 2020-08-01 10:44:17 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2020-08-05 17:31:12 -0400 |
commit | 4f5fc729c7333c45eedf65b972ca8dd651fac985 (patch) | |
tree | 3d968423f090851931b084c4e8afc7926c04a508 /nixos/modules/services/databases | |
parent | 4e3b0097786afc2ffacc219c7beb5d1028c06911 (diff) |
nixos/postgresql: use a standard default value for dataDir
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 579b6a4d9c67..b883134e7dcb 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -21,7 +21,7 @@ let listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' port = ${toString cfg.port} ${cfg.extraConfig} - ''; + ''; groupAccessAvailable = versionAtLeast postgresql.version "11.0"; @@ -55,6 +55,7 @@ in dataDir = mkOption { type = types.path; + defaultText = "/var/lib/postgresql/\${config.services.postgresql.package.psqlSchema}"; example = "/var/lib/postgresql/11"; description = '' Data directory for PostgreSQL. @@ -249,10 +250,7 @@ in else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); - services.postgresql.dataDir = - mkDefault (if versionAtLeast config.system.stateVersion "17.09" - then "/var/lib/postgresql/${cfg.package.psqlSchema}" - else "/var/db/postgresql"); + services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; services.postgresql.authentication = mkAfter '' |