Merge pull request #106 from genuss/conf_ports

Configure listen directive

apache/debian_full.sls

@@ -37,4 +37,9 @@ a2dissite 000-default{{ apache.confext }}:
     - require:
       - pkg: apache
 
+/etc/apache2/ports.conf:
+  file.absent:
+    - require:
+      - pkg: apache
+
 {% endif %} #END: os = debian

apache/files/Debian/apache-2.4.config.jinja

@@ -34,10 +34,6 @@
 #   together by including all remaining configuration files when starting up the
 #   web server.
 #
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
 # * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
 #   directories contain particular configuration snippets which manage modules,
 #   global configuration fragments, or virtual host configurations,
@@ -142,9 +138,6 @@ LogLevel warn
 IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
-# Include list of ports to listen on
-Include ports.conf
-
 
 # Sets the default security model of the Apache2 HTTPD server. It does
 # not allow access to the root filesystem outside of /usr/share and /var/www.

apache/vhosts/proxy.tmpl

@@ -22,6 +22,8 @@
     'ProxyRoute': site.get('ProxyRoute', {}),
 } %}
 
+Listen {{ vals.interface }}:{{ vals.port }}
+
 <VirtualHost {{ vals.interface }}:{{ vals.port }}>
     ServerName {{ vals.ServerName }}
     {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}

apache/vhosts/redirect.tmpl

@@ -23,6 +23,8 @@
 
 } %}
 
+Listen {{ vals.interface }}:{{ vals.port }}
+
 <VirtualHost {{ vals.interface }}:{{ vals.port }}>
     ServerName {{ vals.ServerName }}
     {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}

apache/vhosts/standard.tmpl

@@ -37,6 +37,8 @@
     },
 } %}
 
+Listen {{ vals.interface }}:{{ vals.port }}
+
 <VirtualHost {{ vals.interface }}:{{ vals.port }}>
     ServerName {{ vals.ServerName }}
     {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}