Add listen directive to vhosts templates and remove ports.conf

This commit is contained in:
a.genus 2015-12-24 15:59:57 +03:00
parent 7abbe22724
commit cac7545070
4 changed files with 11 additions and 0 deletions

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

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

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

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