Juju Charms Collection
postgresql package

Merge lp:~therve/charms/precise/postgresql/trunk into lp:charms/postgresql

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into trunk
Proposed by Thomas Herve
Status: Merged
Approved by: Clint Byrum
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~therve/charms/precise/postgresql/trunk
Merge into: lp:charms/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:~therve/charms/precise/postgresql/trunk
Reviewer Review Type Date Requested Status
Clint Byrum (community) Approve
Review via email: mp+104596@code.launchpad.net

Description of the change

The branch fixes a small issue with postgres 9, as the IP address in pg_hba is
missing mask information.

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

Great, thanks Thomas!

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 2012-01-19 01:01:05 +0000
3+++ hooks/db-relation-changed 2012-05-03 19:08:17 +0000
4@@ -14,7 +14,7 @@
5 fi
6
7 grant_host_access() {
8- echo "host $(get_database_name) ${user} ${remote_host} md5" >> /etc/postgresql/*/main/pg_hba.conf
9+ echo "host $(get_database_name) ${user} ${remote_host}/32 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 2012-01-19 01:01:05 +0000
16+++ revision 2012-05-03 19:08:17 +0000
17@@ -1,1 +1,1 @@
18-15
19+16

Subscribers

People subscribed via source and target branches