Merge lp:~stub/charms/precise/postgresql-psql/devel into lp:charms/postgresql-psql

Proposed by Stuart Bishop
Status: Merged
Approved by: Mark Mims
Approved revision: no longer in the source branch.
Merged at revision: 14
Proposed branch: lp:~stub/charms/precise/postgresql-psql/devel
Merge into: lp:charms/postgresql-psql
Diff against target: 24 lines (+2/-5)
3 files modified
.bzrignore (+1/-0)
hooks/install (+1/-4)
revision (+0/-1)
To merge this branch: bzr merge lp:~stub/charms/precise/postgresql-psql/devel
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+169851@code.launchpad.net

Description of the change

Add to system path used by all shells, rather than just login shells.

This allows commands like 'juju ssh psql/0 psql-db-postgresql-0' to work.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

$ juju ssh psql/0 psql-db-postgresql-0
Warning: Permanently added '10.55.63.177' (ECDSA) to the list of known hosts.
psql: FATAL: no pg_hba.conf entry for host "10.55.63.177", user "db_1_psql", database "psql", SSL on
FATAL: no pg_hba.conf entry for host "10.55.63.177", user "db_1_psql", database "psql", SSL off
Connection to 10.55.63.177 closed.
error: exit status 2

Note that this is actually working, demonstrating that the PostgreSQL charm is currently broken per Bug #1190141

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2013-06-17 16:55:33 +0000
4@@ -0,0 +1,1 @@
5+revision
6
7=== modified file 'hooks/install'
8--- hooks/install 2013-05-28 09:53:30 +0000
9+++ hooks/install 2013-06-17 16:55:33 +0000
10@@ -5,7 +5,4 @@
11 apt-get -y install -qq ${PACKAGES}
12
13 juju-log "Adding ${PWD}/bin to \$PATH"
14-cat > /etc/profile.d/juju-`(cd .. && basename ${PWD})`.sh <<EOM
15-#!/bin/bash
16-export PATH=\${PATH}:${PWD}/bin
17-EOM
18+sed -e "/^PATH/s|\"\$|:${PWD}/bin\"|g" -i.bak /etc/environment
19
20=== removed file 'revision'
21--- revision 2013-04-10 12:36:23 +0000
22+++ revision 1970-01-01 00:00:00 +0000
23@@ -1,1 +0,0 @@
24-1

Subscribers

People subscribed via source and target branches