Browse Source

Add listen directive to vhosts templates and remove ports.conf

tags/v0.37.4
a.genus 9 years ago
parent
commit
cac7545070
4 changed files with 11 additions and 0 deletions
  1. +5
    -0
      apache/debian_full.sls
  2. +2
    -0
      apache/vhosts/proxy.tmpl
  3. +2
    -0
      apache/vhosts/redirect.tmpl
  4. +2
    -0
      apache/vhosts/standard.tmpl

+ 5
- 0
apache/debian_full.sls View File

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

+ 2
- 0
apache/vhosts/proxy.tmpl View File

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

+ 2
- 0
apache/vhosts/redirect.tmpl View File

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

+ 2
- 0
apache/vhosts/standard.tmpl View File

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

Loading…
Cancel
Save