Merge lp:~james-page/charm-helpers/fix-ssl-certs into lp:charm-helpers

Proposed by James Page
Status: Merged
Merged at revision: 535
Proposed branch: lp:~james-page/charm-helpers/fix-ssl-certs
Merge into: lp:charm-helpers
Diff against target: 12 lines (+2/-0)
1 file modified
charmhelpers/contrib/openstack/templates/openstack_https_frontend (+2/-0)
To merge this branch: bzr merge lp:~james-page/charm-helpers/fix-ssl-certs
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+287639@code.launchpad.net
To post a comment you must log in.
535. By James Page

Drop session tickets

Revision history for this message
Liam Young (gnuoy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmhelpers/contrib/openstack/templates/openstack_https_frontend'
--- charmhelpers/contrib/openstack/templates/openstack_https_frontend 2014-09-22 15:03:58 +0000
+++ charmhelpers/contrib/openstack/templates/openstack_https_frontend 2016-03-01 14:05:55 +0000
@@ -6,6 +6,8 @@
6<VirtualHost {{ address }}:{{ ext }}>6<VirtualHost {{ address }}:{{ ext }}>
7 ServerName {{ endpoint }}7 ServerName {{ endpoint }}
8 SSLEngine on8 SSLEngine on
9 SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
10 SSLCipherSuite HIGH:!RC4:!MD5:!aNULL:!eNULL:!EXP:!LOW:!MEDIUM
9 SSLCertificateFile /etc/apache2/ssl/{{ namespace }}/cert_{{ endpoint }}11 SSLCertificateFile /etc/apache2/ssl/{{ namespace }}/cert_{{ endpoint }}
10 SSLCertificateKeyFile /etc/apache2/ssl/{{ namespace }}/key_{{ endpoint }}12 SSLCertificateKeyFile /etc/apache2/ssl/{{ namespace }}/key_{{ endpoint }}
11 ProxyPass / http://localhost:{{ int }}/13 ProxyPass / http://localhost:{{ int }}/

Subscribers

People subscribed via source and target branches