Merge lp:~hazmat/charms/trusty/juju-gui/trunk into lp:charms/trusty/juju-gui

[Kapil Thangavelu]

adds proxy environment variable support and updates embedded deployer to 0.3.9 (needed for some ssl proxies).

[Francesco Banconi (frankban)]

Thanks for this fix Kapil!
The branch looks good (with a minor suggestion).
Please note that this merge proposal should be against lp:~juju-gui/charms/trusty/juju-gui/trunk:
that's our development branch. Periodically, the dev branch is then pushed to precise and trusty release branches.
Lbox can be used to propose and submit the charm.
Thank you!

review: Approve

[Kapil Thangavelu (hazmat)]

sounds good, i'll retarget to dev, also added inline comment re no_proxy.

[lp:~hazmat/charms/trusty/juju-gui/trunk]

95. By Kapil Thangavelu on 2014-08-29

fix upstart job, suggestion from review

[Kapil Thangavelu (hazmat)]

Added suggestion, also fixed an issue from field testing.

=== modified file 'config/guiserver.conf.template'
--- config/guiserver.conf.template	2013-11-14 13:06:22 +0000
+++ config/guiserver.conf.template	2014-08-29 15:19:56 +0000
@@ -4,6 +4,18 @@
 start on (filesystem and net-device-up IFACE=lo)
 stop on runlevel [!2345]
 
+{{if https_proxy}}
+env https_proxy="{{https_proxy}}"
+{{endif}}
+
+{{if http_proxy}}
+env http_proxy="{{http_proxy}}"
+{{endif}}
+
+{{if no_proxy}}
+env no_proxy="{{no_proxy}}"
+{{endif}}
+
 exec /usr/bin/python /usr/local/bin/runserver.py \
     --logging="{{builtin_server_logging}}" \
     --guiroot="{{gui_root}}" \

=== removed file 'deps/juju-deployer-0.3.6.tar.gz'
Binary files deps/juju-deployer-0.3.6.tar.gz	2014-04-10 22:41:09 +0000 and deps/juju-deployer-0.3.6.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'deps/juju-deployer-0.3.9.tar.gz'
Binary files deps/juju-deployer-0.3.9.tar.gz	1970-01-01 00:00:00 +0000 and deps/juju-deployer-0.3.9.tar.gz	2014-08-29 15:19:56 +0000 differ
=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-07-08 15:52:13 +0000
+++ hooks/utils.py	2014-08-29 15:19:56 +0000
@@ -524,6 +524,9 @@
         'serve_tests': serve_tests,
         'ssl_cert_path': ssl_cert_path,
         'charmworld_url': charmworld_url,
+        'http_proxy': os.environ.get('http_proxy'),
+        'https_proxy': os.environ.get('https_proxy'),
+        'no_proxy': os.environ.get('no_proxy', os.environ.get('NO_PROXY'))
     }
     if not sandbox:
         api_url = 'wss://{}'.format(get_api_address())

=== modified file 'server-requirements.pip'
--- server-requirements.pip	2014-04-10 22:41:09 +0000
+++ server-requirements.pip	2014-08-29 15:19:56 +0000
@@ -27,5 +27,5 @@
 tornado==3.1.1
 websocket-client==0.12.0
 jujuclient==0.17.5
-juju-deployer==0.3.6
+juju-deployer==0.3.9
 charmworldlib==0.3.0