Update vhosts-2.2.conf.j2

I wanted to be able to add some .htaccess authentication and other stuff
This commit is contained in:
fabiank88 2015-11-17 23:25:51 +01:00
parent ac77f7835e
commit 24d7e84f61

View file

@ -14,10 +14,14 @@ DirectoryIndex index.php index.html
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
{% if vhost.directory_parameters is defined %}
{{ vhost.directory_parameters }}
{% else %}
AllowOverride All AllowOverride All
Options -Indexes FollowSymLinks Options -Indexes FollowSymLinks
Order allow,deny Order allow,deny
Allow from all Allow from all
{% endif %}
</Directory> </Directory>
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
@ -49,10 +53,14 @@ DirectoryIndex index.php index.html
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
{% if vhost.directory_parameters is defined %}
{{ vhost.directory_parameters }}
{% else %}
AllowOverride All AllowOverride All
Options -Indexes FollowSymLinks Options -Indexes FollowSymLinks
Order allow,deny Order allow,deny
Allow from all Allow from all
{% endif %}
</Directory> </Directory>
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}