Merge lp:~hatch/charms/trusty/juju-gui/firefox-cert-fix into lp:~juju-gui/charms/trusty/juju-gui/trunk

[Jeff Pihach]

Fixes https://bugs.launchpad.net/juju-gui/+bug/1397296 by adding a unique integer to the certificate name.

To QA deploy the charm and visit in firefox. When visiting for the first time ensure that the generated certificate name follows the format your-jujugui-########.local

[Richard Harding (rharding)]

LGTM with QA of loading it and deploying it to ec2.

From the SSL details:
The certificate is only valid for your-jujugui-1431034422.local

It then loaded properly and functioned.

Small fix here so feel free to land.

review: Approve

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2015-03-05 17:21:32 +0000
+++ hooks/utils.py	2015-05-07 21:14:00 +0000
@@ -26,6 +26,7 @@
 import shutil
 from subprocess import CalledProcessError
 import tempfile
+import time
 import urlparse
 import yaml
 
@@ -680,11 +681,12 @@
     else:
         # Generate certificates.
         # See http://superuser.com/questions/226192/openssl-without-prompt
+        cn = 'your-jujugui-{0}.local'.format(int(time.time()))
         cmd_log(run(
             'openssl', 'req', '-new', '-newkey', 'rsa:4096',
             '-days', '365', '-nodes', '-x509', '-subj',
             # These are arbitrary test values for the certificate.
-            '/C=GB/ST=Juju/L=GUI/O=Ubuntu/CN=your-jujugui.local',
+            '/C=GB/ST=Juju/L=GUI/O=Ubuntu/CN={0}'.format(cn),
             '-keyout', key_path, '-out', crt_path))
     # Generate the pem file.
     pem_path = os.path.join(ssl_cert_path, JUJU_PEM)