1
=== modified file '.bzrignore'
2
--- .bzrignore	2013-10-10 22:47:57 +0000
3
+++ .bzrignore	2014-11-20 00:34:46 +0000
4
@@ -8,3 +8,4 @@
5
8
*.key
8
*.key
6
9
lib/*
9
lib/*
7
10
build/charm-helpers
10
build/charm-helpers
8
11
.venv/
9
11
12
10
=== modified file 'README.md'
11
--- README.md	2014-06-18 15:25:07 +0000
12
+++ README.md	2014-11-20 00:34:46 +0000
13
@@ -261,6 +261,11 @@
14
261
according to `ssl_certlocation` and `ssl_keylocation` as listed
261
according to `ssl_certlocation` and `ssl_keylocation` as listed
15
262
above.
262
above.
16
263
263
17
264
`ssl_protocol`, `ssl_honor_cipher_order`, and `ssl_cipher_suite` can
18
265
be used to override SSL/TLS version and the cipher suites supported.
19
266
These default to what Canonical IS recommends and is using. Before
20
267
making any changes, please see the Mozilla Security/Server Side TLS.
21
268
22
264
## `{enable,disable}_modules`
269
## `{enable,disable}_modules`
23
265
270
24
266
Space separated list of modules to be enabled or disabled. If a module to
271
Space separated list of modules to be enabled or disabled. If a module to
25
267
272
26
=== modified file 'config.yaml'
27
--- config.yaml	2014-01-30 09:11:53 +0000
28
+++ config.yaml	2014-11-20 00:34:46 +0000
29
@@ -151,6 +151,18 @@
30
151
        base64 encoded chain certificates file.  If ssl_cert is
151
        base64 encoded chain certificates file.  If ssl_cert is
31
152
        specified as SELFSIGNED, this will be ignored.
152
        specified as SELFSIGNED, this will be ignored.
32
153
    default: ''
153
    default: ''
33
154
  ssl_protocol:
34
155
    type: string
35
156
    description: SSL Protocols to enable.
36
157
    default: "ALL -SSLv2 -SSLv3"
37
158
  ssl_honor_cipher_order:
38
159
    type: string
39
160
    description: Enable server cipher suite preference.
40
161
    default: "On"
41
162
  ssl_cipher_suite:
42
163
    type: string
43
164
    description: List of server cipher suites.
44
165
    default: "EECDH+AESGCM+AES128:EDH+AESGCM+AES128:EECDH+AES128:EDH+AES128:ECDH+AESGCM+AES128:aRSA+AESGCM+AES128:ECDH+AES128:DH+AES128:aRSA+AES128:EECDH+AESGCM:EDH+AESGCM:EECDH:EDH:ECDH+AESGCM:aRSA+AESGCM:ECDH:DH:aRSA:HIGH:!MEDIUM:!aNULL:!NULL:!LOW:!3DES:!DSS:!EXP:!PSK:!SRP"
45
154
  server_tokens:
166
  server_tokens:
46
155
    type: string
167
    type: string
47
156
    description: Security setting. Set to one of  Full  OS  Minimal  Minor  Major  Prod
168
    description: Security setting. Set to one of  Full  OS  Minimal  Minor  Major  Prod
48
157
169
49
=== modified file 'data/security.template'
50
--- data/security.template	2014-05-27 14:44:13 +0000
51
+++ data/security.template	2014-11-20 00:34:46 +0000
52
@@ -50,3 +50,9 @@
53
50
# Set to one of:  On | Off | extended
50
# Set to one of:  On | Off | extended
54
51
#
51
#
55
52
TraceEnable {{ trace_enabled }}
52
TraceEnable {{ trace_enabled }}
56
53
57
54
<IfModule mod_ssl.c>
58
55
	SSLProtocol {{ ssl_protocol }}
59
56
	SSLHonorCipherOrder {{ ssl_honor_cipher_order }}
60
57
	SSLCipherSuite {{ ssl_cipher_suite }}
61
58
</IfModule>
62
53
59
63
=== modified file 'hooks/hooks.py'
64
--- hooks/hooks.py	2014-09-10 17:34:41 +0000
65
+++ hooks/hooks.py	2014-11-20 00:34:46 +0000
66
@@ -472,6 +472,9 @@
67
472
        'server_tokens': config_data['server_tokens'],
472
        'server_tokens': config_data['server_tokens'],
68
473
        'server_signature': config_data['server_signature'],
473
        'server_signature': config_data['server_signature'],
69
474
        'trace_enabled': config_data['trace_enabled'],
474
        'trace_enabled': config_data['trace_enabled'],
70
475
        'ssl_protocol': config_data['ssl_protocol'],
71
476
        'ssl_honor_cipher_order': config_data['ssl_honor_cipher_order'],
72
477
        'ssl_cipher_suite': config_data['ssl_cipher_suite'],
73
475
        'is_apache24': is_apache24(),
478
        'is_apache24': is_apache24(),
74
476
    }
479
    }
75
477
    template = \
480
    template = \
Status:	Merged
Merged at revision:	60
Proposed branch:	lp:~hloeung/charms/precise/apache2/ssl-security-options
Merge into:	lp:charms/apache2
Diff against target:	75 lines (+27/-0) 5 files modified .bzrignore (+1/-0) README.md (+5/-0) config.yaml (+12/-0) data/security.template (+6/-0) hooks/hooks.py (+3/-0)
To merge this branch:	bzr merge lp:~hloeung/charms/precise/apache2/ssl-security-options
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Adam Israel (community)			Approve on 2014-12-11
Review Queue (community)	automated testing		Needs Fixing on 2014-10-09
Charles Butler (community)		2014-09-09	Needs Fixing on 2014-09-26
Review via email: mp+233877@code.launchpad.net