Merge ~mthaddon/discourse-charm/+git/discourse-charm:fix-proxy into discourse-charm:master

[Tom Haddon]

Use http-proxy config value for rake install command if appropriate

Use http-proxy config value for rake install command if appropriate

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Yup, looks good.

If this was a new charm, the proxy setting should come from the model config (exposed to the charm as an environment variable).

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change cannot be self approved, setting status to needs review.

[David Lawson (deej)]

+1

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 09f3c2b288a7f93cb18ab9e4b60d4813835564ca

diff --git a/reactive/discourse.py b/reactive/discourse.py
index 8fbd9c7..a7edb9f 100644
--- a/reactive/discourse.py
+++ b/reactive/discourse.py
@@ -111,7 +111,7 @@ def install_discourse():
     rake_install_cmd = ['gem', 'install', 'rake']
     proxy = hookenv.config('http-proxy')
     if proxy:
-        rake_install_cmd.extend(['-p', 'http://squid.internal:3128'])
+        rake_install_cmd.extend(['-p', proxy])
     subprocess.call(rake_install_cmd)
     # Bundle command is from the ruby layer, it'll install our gem dependencies
     bundle('install')