Merge "Disable Apache port 80"
This commit is contained in:
commit
ece024b467
|
@ -144,6 +144,7 @@ NEUTRON_CONF = '%s/neutron.conf' % NEUTRON_CONF_DIR
|
||||||
NEUTRON_LBAAS_CONF = '%s/neutron_lbaas.conf' % NEUTRON_CONF_DIR
|
NEUTRON_LBAAS_CONF = '%s/neutron_lbaas.conf' % NEUTRON_CONF_DIR
|
||||||
NEUTRON_VPNAAS_CONF = '%s/neutron_vpnaas.conf' % NEUTRON_CONF_DIR
|
NEUTRON_VPNAAS_CONF = '%s/neutron_vpnaas.conf' % NEUTRON_CONF_DIR
|
||||||
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
|
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
|
||||||
|
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
|
||||||
APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
|
APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
|
||||||
APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf'
|
APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf'
|
||||||
APACHE_SSL_DIR = '/etc/apache2/ssl/neutron'
|
APACHE_SSL_DIR = '/etc/apache2/ssl/neutron'
|
||||||
|
@ -203,6 +204,10 @@ BASE_RESOURCE_MAP = OrderedDict([
|
||||||
neutron_api_context.HAProxyContext()],
|
neutron_api_context.HAProxyContext()],
|
||||||
'services': ['haproxy'],
|
'services': ['haproxy'],
|
||||||
}),
|
}),
|
||||||
|
(APACHE_PORTS_CONF, {
|
||||||
|
'contexts': [],
|
||||||
|
'services': ['apache2'],
|
||||||
|
}),
|
||||||
])
|
])
|
||||||
|
|
||||||
# The interface is said to be satisfied if anyone of the interfaces in the
|
# The interface is said to be satisfied if anyone of the interfaces in the
|
||||||
|
|
|
@ -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>
|
|
@ -271,6 +271,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
||||||
(nutils.API_PASTE_INI, ['neutron-server']),
|
(nutils.API_PASTE_INI, ['neutron-server']),
|
||||||
(nutils.APACHE_CONF, ['apache2']),
|
(nutils.APACHE_CONF, ['apache2']),
|
||||||
(nutils.HAPROXY_CONF, ['haproxy']),
|
(nutils.HAPROXY_CONF, ['haproxy']),
|
||||||
|
(nutils.APACHE_PORTS_CONF, ['apache2']),
|
||||||
(ML2CONF, ['neutron-server']),
|
(ML2CONF, ['neutron-server']),
|
||||||
])
|
])
|
||||||
self.assertEqual(_restart_map, expect)
|
self.assertEqual(_restart_map, expect)
|
||||||
|
@ -289,6 +290,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
||||||
(nutils.API_PASTE_INI, ['neutron-server']),
|
(nutils.API_PASTE_INI, ['neutron-server']),
|
||||||
(nutils.APACHE_CONF, ['apache2']),
|
(nutils.APACHE_CONF, ['apache2']),
|
||||||
(nutils.HAPROXY_CONF, ['haproxy']),
|
(nutils.HAPROXY_CONF, ['haproxy']),
|
||||||
|
(nutils.APACHE_PORTS_CONF, ['apache2']),
|
||||||
(ML2CONF, ['neutron-server']),
|
(ML2CONF, ['neutron-server']),
|
||||||
('{}/*'.format(nutils.APACHE_SSL_DIR),
|
('{}/*'.format(nutils.APACHE_SSL_DIR),
|
||||||
['apache2', 'neutron-server']),
|
['apache2', 'neutron-server']),
|
||||||
|
@ -315,6 +317,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
||||||
'/etc/neutron/api-paste.ini',
|
'/etc/neutron/api-paste.ini',
|
||||||
'/etc/default/neutron-server',
|
'/etc/default/neutron-server',
|
||||||
'/etc/neutron/plugins/ml2/ml2_conf.ini',
|
'/etc/neutron/plugins/ml2/ml2_conf.ini',
|
||||||
|
'/etc/apache2/ports.conf',
|
||||||
'/etc/apache2/sites-available/openstack_https_frontend',
|
'/etc/apache2/sites-available/openstack_https_frontend',
|
||||||
'/etc/haproxy/haproxy.cfg']
|
'/etc/haproxy/haproxy.cfg']
|
||||||
self.assertEqual(sorted(_regconfs.configs), sorted(confs))
|
self.assertEqual(sorted(_regconfs.configs), sorted(confs))
|
||||||
|
|
Loading…
Reference in New Issue