Merge lp:~tribaal/charms/trusty/haproxy/longer-openssl-selfsigned into lp:charms/trusty/haproxy

[Chris Glass]

This branch makes the self-signed SSL certificate last for 3650 days instead of the default of 30 days.

Passing the value in the config files doesn't actually works, turns out. Passing it through the command-line invocation does work. This furthermore makes the haproxy charm do the same thing as the apache2 charm, improving overall consistency.

[David Britton (dpb)]

review: Approve

=== modified file 'data/openssl.cnf'
--- data/openssl.cnf	2015-01-20 17:39:18 +0000
+++ data/openssl.cnf	2015-10-16 09:43:21 +0000
@@ -1,7 +1,6 @@
 RANDFILE                = /dev/urandom
 
 [ req ]
-default_days            = 3650
 default_bits            = 1024
 default_keyfile         = privkey.pem
 distinguished_name      = req_distinguished_name

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-08-18 10:57:55 +0000
+++ hooks/hooks.py	2015-10-16 09:43:21 +0000
@@ -1257,7 +1257,7 @@
     subprocess.call(
         ['openssl', 'req', '-new', '-x509', '-nodes', '-config',
          os.path.join(os.environ['CHARM_DIR'], 'data', 'openssl.cnf'),
-         '-keyout', key_file, '-out', cert_file],)
+         '-keyout', key_file, '-out', cert_file, '-days', '3650'],)
     os.umask(old_mask)
     uid = pwd.getpwnam('haproxy').pw_uid
     os.chown(key_file, uid, -1)