openstack/charm-swift-proxy
Code Issues Proposed changes

Merge "Revert "Disable Apache default ports""

Browse Source
This commit is contained in:
Zuul
2019-12-20 09:43:38 +00:00
committed by Gerrit Code Review
parent d80cb2a8ed f7a3670d87
commit e31253d15b
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/swift_utils.py
View File

@@ -93,7 +93,6 @@ MEMCACHED_CONF = '/etc/memcached.conf'
SWIFT_RINGS_CONF = '/etc/apache2/conf.d/swift-rings' SWIFT_RINGS_CONF = '/etc/apache2/conf.d/swift-rings'
SWIFT_RINGS_24_CONF = '/etc/apache2/conf-available/swift-rings.conf' SWIFT_RINGS_24_CONF = '/etc/apache2/conf-available/swift-rings.conf'
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg' HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
APACHE_SITES_AVAILABLE = '/etc/apache2/sites-available' APACHE_SITES_AVAILABLE = '/etc/apache2/sites-available'
APACHE_SITE_CONF = os.path.join(APACHE_SITES_AVAILABLE, APACHE_SITE_CONF = os.path.join(APACHE_SITES_AVAILABLE,
'openstack_https_frontend') 'openstack_https_frontend')
@@ -200,10 +199,6 @@ CONFIG_FILES = OrderedDict([
'hook_contexts': [MemcachedContext()], 'hook_contexts': [MemcachedContext()],
'services': ['memcached'], 'services': ['memcached'],
}), }),
(APACHE_PORTS_CONF, {
'contexts': [],
'services': ['apache2'],
}),
]) ])
RING_CONSUMER_ROLE = 'swift-proxy-rings-consumer' RING_CONSUMER_ROLE = 'swift-proxy-rings-consumer'

1
templates/ports.conf
View File

@@ -1 +0,0 @@
#File written by Juju: leave default ports closed (see LP 1845665).