fix template
This commit is contained in:
parent
a1fe7a952c
commit
78c107d1c2
1 changed files with 6 additions and 6 deletions
|
@ -9,8 +9,8 @@
|
||||||
ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
|
ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/
|
## Directories, there should at least be a declaration for {{ item.docroot | default("/var/www/" + item.vhostname) }}/
|
||||||
<Directory "{{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/">
|
<Directory "{{ item.docroot | default("/var/www/" + item.vhostname) }}/">
|
||||||
Options +FollowSymlinks
|
Options +FollowSymlinks
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
<VirtualHost *:{{ ssl_port|default("443") }}>
|
<VirtualHost *:{{ ssl_port|default("443") }}>
|
||||||
ServerName {{ item.vhostname }}
|
ServerName {{ item.vhostname }}
|
||||||
ServerAdmin {{ item.serveradmin|default("webmaster@{{ item.vhostname }}") }}
|
ServerAdmin {{ item.serveradmin|default("webmaster@" + item.vhostname ) }}
|
||||||
{% if item.server_aliases is defined %}
|
{% if item.server_aliases is defined %}
|
||||||
ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
|
ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -37,11 +37,11 @@
|
||||||
|
|
||||||
|
|
||||||
{% if item.docroot is defined %} ## Vhost docroot
|
{% if item.docroot is defined %} ## Vhost docroot
|
||||||
DocumentRoot "{{ item.docroot | default("/var/www/{{ item.vhostname }}") }}/"
|
DocumentRoot "{{ item.docroot | default("/var/www/" + item.vhostname ) }}/"
|
||||||
|
|
||||||
## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/
|
## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/' + item.vhostname ) }}/
|
||||||
|
|
||||||
<Directory "{{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/">
|
<Directory "{{ item.docroot | default('/var/www/' + item.vhostname ) }}/">
|
||||||
{% if item.root_options is defined %}
|
{% if item.root_options is defined %}
|
||||||
Options {% for option in item.root_options %}{{ option }} {% endfor %}
|
Options {% for option in item.root_options %}{{ option }} {% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue