Merge lp:~frankban/charms/precise/juju-gui/bug-1092515-certificates into lp:~juju-gui/charms/precise/juju-gui/trunk
Status: | Merged |
---|---|
Merged at revision: | 19 |
Proposed branch: | lp:~frankban/charms/precise/juju-gui/bug-1092515-certificates |
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk |
Diff against target: |
283 lines (+94/-24) 7 files modified
config.yaml (+12/-0) config/nginx.conf.template (+2/-2) hooks/config-changed (+13/-4) hooks/install (+5/-1) hooks/start (+3/-1) hooks/utils.py (+30/-14) tests/test_utils.py (+29/-2) |
To merge this branch: | bzr merge lp:~frankban/charms/precise/juju-gui/bug-1092515-certificates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+141105@code.launchpad.net |
Description of the change
Allow using an own SSL cert and private key.
Added two new config options, one for the certificate, one
for the private key. If they are both provided, they are used
by nginx, otherwise, a new certificate is automatically
generated.
Fixed a pre-existent bug: even if you can specify the
directory where to store the certificates, this path
was not used by nginx, because an hardcoded one was
present in the configuration file.
Improved how ssl options are handled in config-changes.
If the SSL path is changed using 'juju set', now that
change is reflected in the nginx config file, and the
service correctly restarted.
Added tests for the process of saving or generating SSL
certificates.
Some code clean up.
Please note that all the SSL stuff is still
disabled/commented.
Reviewers: mp+141105_ code.launchpad. net,
Message:
Please take a look.
Description:
Allow using an own SSL cert and private key.
Added two new config options, one for the certificate, one
for the private key. If they are both provided, they are used
by nginx, otherwise, a new certificate is automatically
generated.
Fixed a pre-existent bug: even if you can specify the
directory where to store the certificates, this path
was not used by nginx, because an hardcoded one was
present in the configuration file.
Improved how ssl options are handled in config-changes.
If the SSL path is changed using 'juju set', now that
change is reflected in the nginx config file, and the
service correctly restarted.
Added tests for the process of saving or generating SSL
certificates.
Some code clean up.
Please note that all the SSL stuff is still
disabled/commented.
https:/ /code.launchpad .net/~frankban/ charms/ precise/ juju-gui/ bug-1092515- certificates/ +merge/ 141105
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/6976046/
Affected files: nginx.conf. template config- changed test_utils. py
[revision details]
config.yaml
config/
hooks/
hooks/install
hooks/start
hooks/utils.py
tests/