Author: eelco
Date: Mon Mar 19 18:06:18 2012
New Revision: 33268
URL: https://nixos.org/websvn/nix/?rev=33268&sc=1
Log:
* Support PostgreSQL versions >= 8.4, which have a slightly different
pg_hba.conf format.
Modified:
nixos/trunk/modules/services/databases/postgresql.nix
Modified: nixos/trunk/modules/services/databases/postgresql.nix
==============================================================================
--- nixos/trunk/modules/services/databases/postgresql.nix Mon Mar 19
18:04:47 2012 (r33267)
+++ nixos/trunk/modules/services/databases/postgresql.nix Mon Mar 19
18:06:18 2012 (r33268)
@@ -10,7 +10,7 @@
postgresqlAndPlugins = pg:
if cfg.extraPlugins == [] then pg
else pkgs.buildEnv {
- name = "postgresql-and-plugins";
+ name = "postgresql-and-plugins-${(builtins.parseDrvName
pg.name).version}";
paths = [ pg ] ++ cfg.extraPlugins;
postBuild =
''
@@ -35,6 +35,8 @@
${cfg.extraConfig}
'';
+ pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
+
in
{
@@ -133,7 +135,7 @@
services.postgresql.authentication =
''
# Generated file; do not edit!
- local all all ident sameuser
+ local all all ident ${optionalString pre84 "sameuser"}
host all all 127.0.0.1/32 md5
host all all ::1/128 md5
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
