Merge lp:~ce-infrastructure/capomastro/capomastro-private-ppa-1387809 into lp:~ubuntuone-hackers/capomastro/charm

[Caio Begotti]

It is really annoying that apt-add-repository won't accept private PPAs so that was needed otherwise I would have to keep changing the install hooks of both Capomastro's and our forked Jenkins' charms. At least with this we can keep the private repository line with auth stuff in it separated in a config.yaml used for deployment only. This only affects Capomastro as the Jenkins changes were pushed to my forked (+junk) Jenkins charm already.

[Caio Begotti (caio1982)]

Btw this is the original bug that this will fix, eventually: https://bugs.launchpad.net/capomastro/+bug/1387809

[Sheila Miguez (codersquid)]

+1 to the change.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-03 20:22:30 +0000
+++ config.yaml	2014-11-13 02:55:22 +0000
@@ -39,4 +39,7 @@
     type: string
     default: "capomastro@localhost"
     description: "The superuser e-mail address for eventual notifications"
-
+  repository:
+    type: string
+    default: "ppa:ce-infrastructure/capomastro"
+    description: "The PPA address or private repository line for apt-add-repository"

=== modified file 'hooks/install'
--- hooks/install	2014-11-04 11:14:37 +0000
+++ hooks/install	2014-11-13 02:55:22 +0000
@@ -4,9 +4,7 @@
 
 . inc/common
 
-PPA="ce-infrastructure/capomastro"
-
-apt-add-repository --yes ppa:${PPA} && apt-get update && apt-get install --assume-yes --force-yes --no-install-recommends capomastro
+apt-add-repository --yes "${repository}" && apt-get update && apt-get install --assume-yes --force-yes capomastro
 
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747270
 apt-get --assume-yes --force-yes --purge remove python-librabbitmq

=== modified file 'inc/common'
--- inc/common	2014-11-04 19:35:30 +0000
+++ inc/common	2014-11-13 02:55:22 +0000
@@ -4,6 +4,7 @@
 
 # development
 debug=$(config-get debug)
+repository=$(config-get repository)
 
 # apache's site config
 port=$(config-get port)