Juju Charms Collection
postgresql package

Merge lp:~matsubara/charms/oneiric/postgresql/psql into lp:charms/oneiric/postgresql

  1. Oneiric (11.10)
  2. psql
  3. Merge into trunk
Proposed by Diogo Matsubara
Status: Merged
Approved by: Clint Byrum
Approved revision: 20
Merged at revision: 20
Proposed branch: lp:~matsubara/charms/oneiric/postgresql/psql
Merge into: lp:charms/oneiric/postgresql
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/db-relation-changed (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~matsubara/charms/oneiric/postgresql/psql
Reviewer Review Type Date Requested Status
Clint Byrum (community) Approve
Review via email: mp+89309@code.launchpad.net

Description of the change

This branch fixes bug 918825 by removing the CIDR from the pg_hba.conf during a db-relation-changed hook call.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Tested, works great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/db-relation-changed'
2--- hooks/db-relation-changed 2011-11-09 19:34:44 +0000
3+++ hooks/db-relation-changed 2012-01-19 17:58:28 +0000
4@@ -14,7 +14,7 @@
5 fi
6
7 grant_host_access() {
8- echo "host $(get_database_name) ${user} ${remote_host}/0 md5" >> /etc/postgresql/*/main/pg_hba.conf
9+ echo "host $(get_database_name) ${user} ${remote_host} md5" >> /etc/postgresql/*/main/pg_hba.conf
10 }
11 host_can_access() {
12 grep -q "$(get_database_name).*${user}.*${remote_host}" /etc/postgresql/*/main/pg_hba.conf
13
14=== modified file 'revision'
15--- revision 2011-11-22 10:03:11 +0000
16+++ revision 2012-01-19 17:58:28 +0000
17@@ -1,1 +1,1 @@
18-14
19+15

Subscribers

People subscribed via source and target branches

to all changes: