openstack
/
charm-keystone
Code Issues Proposed changes

Merge "Disable Apache port 80"

This commit is contained in:
Zuul 2020-01-31 15:48:16 +00:00 committed by Gerrit Code Review
parent 848ce4b5f4 92e75b5aad
commit 3412211669
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/keystone_utils.py
View File

@ -207,6 +207,7 @@ else:
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf'
MEMCACHED_CONF = '/etc/memcached.conf'
@ -295,6 +296,10 @@ BASE_RESOURCE_MAP = OrderedDict([
context.SyslogContext()],
'services': [],
}),
(APACHE_PORTS_CONF, {
'contexts': [],
'services': ['apache2'],
}),
])
valid_services = {

4
templates/ports.conf Normal file
View File

@ -0,0 +1,4 @@
# File written by Juju: don't open default ports on SSL environments (see LP 1845665).
<IfModule !ssl_module>
Listen 80
</IfModule>