Merge ~fginther/postgresql-charm:master into postgresql-charm:master

[Francis Ginther]

Remove the addition of ppa:stub/pgcharm by the charm itself to allow use of wal-e in restricted environments.

Remove the addition of ppa:stub/pgcharm by the charm itself to allow use of wal-e in restricted environments.

In a production environment, we want to use our own PPA or archive for supplying apt dependencies. The PPA can still be added via the install_sources option.

[Stuart Bishop (stub)]

Looks fine. test_wal_e_swift_logshipping will also need adjusting, but I can do that.

review: Approve

diff --git a/reactive/postgresql/wal_e.py b/reactive/postgresql/wal_e.py
index 231f645..d3b9bdc 100644
--- a/reactive/postgresql/wal_e.py
+++ b/reactive/postgresql/wal_e.py
@@ -41,10 +41,10 @@ def main():
 @when('postgresql.wal_e.enabled')
 @when_not('apt.installed.wal_e')
 def install():
-    # WAL-E is currently only available from a PPA. This charm and this
-    # PPA are maintained by the same person.
-    hookenv.log('Adding ppa:stub/pgcharm for wal-e packages')
-    apt.add_source('ppa:stub/pgcharm')
+    # WAL-E is currently only available from a PPA, ppa:stub/pgcharm.
+    # This charm and this PPA are maintained by the same person.
+    # Ensure that this PPA or another containing the 'wal-e' package
+    # is included as an install_source.
     apt.queue_install(['daemontools', 'wal-e'])