Merge "Disable Apache port 80"

hooks/heat_utils.py

@@ -113,6 +113,7 @@ HEAT_DIR = '/etc/heat'
 HEAT_CONF = '/etc/heat/heat.conf'
 HEAT_API_PASTE = '/etc/heat/api-paste.ini'
 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_24_CONF = os.path.join('/etc/apache2/sites-available',
                                     'openstack_https_frontend.conf')
@@ -165,6 +166,10 @@ CONFIG_FILES = OrderedDict([
         'contexts': [context.MemcacheContext()],
         'services': ['memcached'],
     }),
+    (APACHE_PORTS_CONF, {
+        'contexts': [],
+        'services': ['apache2'],
+    }),
 ])
 
 

templates/ports.conf

@@ -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>

unit_tests/test_heat_utils.py

@@ -54,6 +54,7 @@ RESTART_MAP = OrderedDict([
     ('/etc/apache2/sites-available/openstack_https_frontend.conf',
      ['apache2']),
     ('/etc/memcached.conf', ['memcached']),
+    ('/etc/apache2/ports.conf', ['apache2']),
 ])