Merge "Disable Apache default ports"
This commit is contained in:
commit
e6d34b0b66
@ -121,6 +121,7 @@ CEPH_CONF = "/etc/ceph/ceph.conf"
|
|||||||
CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
|
CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
|
||||||
|
|
||||||
HAPROXY_CONF = "/etc/haproxy/haproxy.cfg"
|
HAPROXY_CONF = "/etc/haproxy/haproxy.cfg"
|
||||||
|
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
|
||||||
HTTPS_APACHE_CONF = "/etc/apache2/sites-available/openstack_https_frontend"
|
HTTPS_APACHE_CONF = "/etc/apache2/sites-available/openstack_https_frontend"
|
||||||
HTTPS_APACHE_24_CONF = "/etc/apache2/sites-available/" \
|
HTTPS_APACHE_24_CONF = "/etc/apache2/sites-available/" \
|
||||||
"openstack_https_frontend.conf"
|
"openstack_https_frontend.conf"
|
||||||
@ -208,7 +209,11 @@ CONFIG_FILES = OrderedDict([
|
|||||||
(HTTPS_APACHE_24_CONF, {
|
(HTTPS_APACHE_24_CONF, {
|
||||||
'hook_contexts': [glance_contexts.ApacheSSLContext()],
|
'hook_contexts': [glance_contexts.ApacheSSLContext()],
|
||||||
'services': ['apache2'],
|
'services': ['apache2'],
|
||||||
})
|
}),
|
||||||
|
(APACHE_PORTS_CONF, {
|
||||||
|
'contexts': [],
|
||||||
|
'services': ['apache2'],
|
||||||
|
}),
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
1
templates/ports.conf
Normal file
1
templates/ports.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
#File written by Juju: leave default ports closed (see LP 1845665).
|
@ -154,6 +154,7 @@ class TestGlanceUtils(CharmTestCase):
|
|||||||
(utils.HAPROXY_CONF, ['haproxy']),
|
(utils.HAPROXY_CONF, ['haproxy']),
|
||||||
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
||||||
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
||||||
|
(utils.APACHE_PORTS_CONF, ['apache2']),
|
||||||
(utils.MEMCACHED_CONF, ['memcached']),
|
(utils.MEMCACHED_CONF, ['memcached']),
|
||||||
(utils.GLANCE_POLICY_FILE, ['glance-api', 'glance-registry']),
|
(utils.GLANCE_POLICY_FILE, ['glance-api', 'glance-registry']),
|
||||||
])
|
])
|
||||||
@ -175,6 +176,7 @@ class TestGlanceUtils(CharmTestCase):
|
|||||||
(utils.HAPROXY_CONF, ['haproxy']),
|
(utils.HAPROXY_CONF, ['haproxy']),
|
||||||
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
||||||
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
||||||
|
(utils.APACHE_PORTS_CONF, ['apache2']),
|
||||||
(utils.MEMCACHED_CONF, ['memcached']),
|
(utils.MEMCACHED_CONF, ['memcached']),
|
||||||
(utils.GLANCE_POLICY_FILE, ['glance-api']),
|
(utils.GLANCE_POLICY_FILE, ['glance-api']),
|
||||||
])
|
])
|
||||||
@ -198,6 +200,7 @@ class TestGlanceUtils(CharmTestCase):
|
|||||||
(utils.HAPROXY_CONF, ['haproxy']),
|
(utils.HAPROXY_CONF, ['haproxy']),
|
||||||
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_CONF, ['apache2']),
|
||||||
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
|
||||||
|
(utils.APACHE_PORTS_CONF, ['apache2']),
|
||||||
(utils.MEMCACHED_CONF, ['memcached']),
|
(utils.MEMCACHED_CONF, ['memcached']),
|
||||||
(utils.GLANCE_POLICY_FILE, ['glance-api']),
|
(utils.GLANCE_POLICY_FILE, ['glance-api']),
|
||||||
('{}/*'.format(utils.APACHE_SSL_DIR),
|
('{}/*'.format(utils.APACHE_SSL_DIR),
|
||||||
|
Loading…
Reference in New Issue
Block a user