Merge lp:~patrick-hetu/charms/precise/postgresql/fix-gethostip-902672 into lp:charms/postgresql

[Patrick Hetu]

Fix for https://bugs.launchpad.net/charms/+source/postgresql/+bug/902672

[Mark Mims (mark-mims)]

awesome... thanks for fixing this annoying issue!

I'll test this out against all our various providers... this went back and forth so much because of different responses to `private-address` from different providers. Hopefully gethostip'll work across the board... looks great so far.

review: Approve

=== modified file 'hooks/common.sh'
--- hooks/common.sh	2011-11-22 10:03:11 +0000
+++ hooks/common.sh	2012-06-14 02:50:25 +0000
@@ -1,10 +1,10 @@
 
-
+ip=$(unit-get private-address)
 database=${JUJU_REMOTE_UNIT///*}
 database=${database//-/_}
 user=${JUJU_REMOTE_UNIT///*}
 user=${user//-/_}
-host=`unit-get private-address`
+host=`gethostip $ip | awk '{print $2}'`
 
 admin() {
   [[ $(basename $0) =~ admin ]]

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2012-05-03 18:30:16 +0000
+++ hooks/db-relation-changed	2012-06-14 02:50:25 +0000
@@ -13,11 +13,13 @@
   exit 0
 fi
 
+remote_ip=`gethostip $remote_host | awk '{print $2}'`
+
 grant_host_access() {
-  echo "host $(get_database_name) ${user} ${remote_host}/32 md5" >> /etc/postgresql/*/main/pg_hba.conf
+  echo "host $(get_database_name) ${user} ${remote_ip}/32 md5" >> /etc/postgresql/*/main/pg_hba.conf
 }
 host_can_access() {
-  grep -q "$(get_database_name).*${user}.*${remote_host}" /etc/postgresql/*/main/pg_hba.conf
+  grep -q "$(get_database_name).*${user}.*${remote_ip}" /etc/postgresql/*/main/pg_hba.conf
 }
 host_can_access || grant_host_access
 

=== modified file 'hooks/install'
--- hooks/install	2011-11-09 19:34:44 +0000
+++ hooks/install	2012-06-14 02:50:25 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sudo apt-get install -qqy --no-install-recommends  postgresql pwgen
+sudo apt-get install -qqy --no-install-recommends  postgresql pwgen syslinux
 
 echo "listen_addresses = '*'" >> /etc/postgresql/*/main/postgresql.conf