diff --git a/lib/swift_utils.py b/lib/swift_utils.py index 4b3ed40..61893de 100644 --- a/lib/swift_utils.py +++ b/lib/swift_utils.py @@ -93,7 +93,6 @@ MEMCACHED_CONF = '/etc/memcached.conf' SWIFT_RINGS_CONF = '/etc/apache2/conf.d/swift-rings' SWIFT_RINGS_24_CONF = '/etc/apache2/conf-available/swift-rings.conf' HAPROXY_CONF = '/etc/haproxy/haproxy.cfg' -APACHE_PORTS_CONF = '/etc/apache2/ports.conf' APACHE_SITES_AVAILABLE = '/etc/apache2/sites-available' APACHE_SITE_CONF = os.path.join(APACHE_SITES_AVAILABLE, 'openstack_https_frontend') @@ -200,10 +199,6 @@ CONFIG_FILES = OrderedDict([ 'hook_contexts': [MemcachedContext()], 'services': ['memcached'], }), - (APACHE_PORTS_CONF, { - 'contexts': [], - 'services': ['apache2'], - }), ]) diff --git a/templates/ports.conf b/templates/ports.conf deleted file mode 100644 index b46c728..0000000 --- a/templates/ports.conf +++ /dev/null @@ -1 +0,0 @@ -#File written by Juju: leave default ports closed (see LP 1845665).