diff --git a/apache/debian_full.sls b/apache/debian_full.sls index a209088..44bba6b 100644 --- a/apache/debian_full.sls +++ b/apache/debian_full.sls @@ -37,9 +37,4 @@ a2dissite 000-default{{ apache.confext }}: - require: - pkg: apache -/etc/apache2/ports.conf: - file.absent: - - require: - - pkg: apache - {% endif %} #END: os = debian diff --git a/apache/files/Debian/apache-2.4.config.jinja b/apache/files/Debian/apache-2.4.config.jinja index e630836..854fc2d 100644 --- a/apache/files/Debian/apache-2.4.config.jinja +++ b/apache/files/Debian/apache-2.4.config.jinja @@ -34,6 +34,10 @@ # 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, @@ -138,6 +142,9 @@ 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. diff --git a/apache/vhosts/proxy.tmpl b/apache/vhosts/proxy.tmpl index 9e8ea70..36b1887 100644 --- a/apache/vhosts/proxy.tmpl +++ b/apache/vhosts/proxy.tmpl @@ -22,10 +22,6 @@ 'ProxyRoute': site.get('ProxyRoute', {}), } %} -{% for intf in vals.interfaces -%} -Listen {{ intf }}:{{ vals.port }} -{% endfor %} - ServerName {{ vals.ServerName }} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} diff --git a/apache/vhosts/redirect.tmpl b/apache/vhosts/redirect.tmpl index af1ccbb..ff1c5ec 100644 --- a/apache/vhosts/redirect.tmpl +++ b/apache/vhosts/redirect.tmpl @@ -23,10 +23,6 @@ } %} -{% for intf in vals.interfaces -%} -Listen {{ intf }}:{{ vals.port }} -{% endfor %} - ServerName {{ vals.ServerName }} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index 5973631..562336e 100644 --- a/apache/vhosts/standard.tmpl +++ b/apache/vhosts/standard.tmpl @@ -38,10 +38,6 @@ }, } -%} -{% for intf in vals.interfaces -%} -Listen {{ intf }}:{{ vals.port }} -{% endfor %} - ServerName {{ vals.ServerName }} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}