3
0
Fork 0
forked from mirrors/nixpkgs

* Support PostgreSQL versions >= 8.4, which have a slightly different

pg_hba.conf format.

svn path=/nixos/trunk/; revision=33268
This commit is contained in:
Eelco Dolstra 2012-03-19 18:06:18 +00:00
parent fac0fef5d8
commit 31c93522d5

View file

@ -10,7 +10,7 @@ let
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 @@ let
${cfg.extraConfig}
'';
pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
in
{
@ -133,7 +135,7 @@ in
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
'';