diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-04-03 13:47:36 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-04-03 13:47:36 +0000 |
| commit | 998b07141cd1b1db34c4188528e8a988e38d4e47 (patch) | |
| tree | f2a24ec98932633307142d773d31e55690518092 | |
| parent | d5022dd702b2c80739660c2ad07e9a7736a6afb7 (diff) | |
| download | puppet-998b07141cd1b1db34c4188528e8a988e38d4e47.tar puppet-998b07141cd1b1db34c4188528e8a988e38d4e47.tar.gz puppet-998b07141cd1b1db34c4188528e8a988e38d4e47.tar.bz2 puppet-998b07141cd1b1db34c4188528e8a988e38d4e47.tar.xz puppet-998b07141cd1b1db34c4188528e8a988e38d4e47.zip | |
Fix db name in pg_hba.conf, and hack youri-check config to connect over ssl
| -rw-r--r-- | modules/postgresql/templates/pg_hba.conf | 8 | ||||
| -rw-r--r-- | modules/youri-check/templates/check.conf | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/postgresql/templates/pg_hba.conf b/modules/postgresql/templates/pg_hba.conf index 625d3966..bfc86c12 100644 --- a/modules/postgresql/templates/pg_hba.conf +++ b/modules/postgresql/templates/pg_hba.conf @@ -115,12 +115,10 @@ hostssl template1 bugs 212.85.158.146/32 md5 hostssl template1 bugs 2a02:2178:2:7::2/128 md5 # Allow youri-ckeck on rabbit to access the results db -hostssl youri youri 88.190.12.224/32 md5 +hostssl youri_check youri 88.190.12.224/32 md5 # Allow local access too -host youri youri 212.85.158.146/32 md5 -host youri youri 2a02:2178:2:7::2/128 md5 -hostssl youri youri 212.85.158.146/32 md5 -hostssl youri youri 2a02:2178:2:7::2/128 md5 +hostssl youri_check youri 212.85.158.146/32 md5 +hostssl youri_check youri 2a02:2178:2:7::2/128 md5 # "local" is for Unix domain socket connections only local all all ident map=local diff --git a/modules/youri-check/templates/check.conf b/modules/youri-check/templates/check.conf index 431a4004..ccf4fc1c 100644 --- a/modules/youri-check/templates/check.conf +++ b/modules/youri-check/templates/check.conf @@ -10,7 +10,7 @@ resultset: class: Youri::Check::Resultset::DBI options: driver: Pg - host: <%= pgsql_server %> + host: <%= pgsql_server %>;sslmode=require base: <%= pgsql_db %> user: <%= pgsql_user %> pass: <%= pgsql_password %> |