Merge lp:~caio1982/capomastro/stoppgsqlforrealz into lp:~ubuntuone-hackers/capomastro/charm

[Caio Begotti]

This should hopefully help Capomastro not to loose its mind again if Postgresql is upgraded from the Debian package, thus being brought up suddenly and confusing the charm checks for DB relation. This has caused a bunch of HTTP 500s today. Axino found out the culprit.

This should hopefully help Capomastro not to loose its mind again if Postgresql is upgraded from the Debian package, thus being brought up suddenly and confusing the charm checks for DB relation. This has caused a bunch of HTTP 500s today. Axino found out the culprit.

[Daniel Manrique (roadmr)]

Looks OK to me, thanks!

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-07-03 20:05:12 +0000
+++ hooks/config-changed	2016-09-01 17:17:11 +0000
@@ -39,7 +39,7 @@
 #---------- postgresql
 
 # if not running from a relation, while postgresql is still enabled
-if [[ -z ${pg_name} ]] && $(pgrep -f postgres > /dev/null); then
+if [[ -z ${db_name} ]] && $(pgrep -f postgres > /dev/null); then
 	juju-log "Setting up local DB..."
 
 	export t_db_name=${db_name}
 
=== modified file 'hooks/db-relation-departed'
--- hooks/db-relation-departed	2014-12-16 17:01:34 +0000
+++ hooks/db-relation-departed	2016-09-01 17:17:11 +0000
@@ -2,3 +2,4 @@
 
 service postgresql start
 update-rc.d postgresql defaults
+echo auto > /etc/postgresql/9.3/main/start.conf
 
=== modified file 'hooks/db-relation-joined'
--- hooks/db-relation-joined	2015-03-06 22:11:30 +0000
+++ hooks/db-relation-joined	2016-09-01 17:17:11 +0000
@@ -30,6 +30,7 @@
 # disables local one
 service postgresql stop
 update-rc.d -f postgresql remove
+echo disabled > /etc/postgresql/9.3/main/start.conf
 
 juju-log "Saving remote DB configuration in ${db_config}"
 cheetah fill --env --stdout templates/capomastro_db_settings.tmpl > ${db_config}