mirror of
https://github.com/geerlingguy/ansible-role-apache
synced 2025-01-18 07:20:19 +01:00
Update vhosts-2.2.conf.j2
I wanted to be able to add some .htaccess authentication and other stuff
This commit is contained in:
parent
ac77f7835e
commit
24d7e84f61
1 changed files with 16 additions and 8 deletions
|
@ -14,10 +14,14 @@ DirectoryIndex index.php index.html
|
||||||
ServerAdmin {{ vhost.serveradmin }}
|
ServerAdmin {{ vhost.serveradmin }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<Directory "{{ vhost.documentroot }}">
|
<Directory "{{ vhost.documentroot }}">
|
||||||
AllowOverride All
|
{% if vhost.directory_parameters is defined %}
|
||||||
Options -Indexes FollowSymLinks
|
{{ vhost.directory_parameters }}
|
||||||
Order allow,deny
|
{% else %}
|
||||||
Allow from all
|
AllowOverride All
|
||||||
|
Options -Indexes FollowSymLinks
|
||||||
|
Order allow,deny
|
||||||
|
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 }}">
|
||||||
AllowOverride All
|
{% if vhost.directory_parameters is defined %}
|
||||||
Options -Indexes FollowSymLinks
|
{{ vhost.directory_parameters }}
|
||||||
Order allow,deny
|
{% else %}
|
||||||
Allow from all
|
AllowOverride All
|
||||||
|
Options -Indexes FollowSymLinks
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
{% endif %}
|
||||||
</Directory>
|
</Directory>
|
||||||
{% if vhost.extra_parameters is defined %}
|
{% if vhost.extra_parameters is defined %}
|
||||||
{{ vhost.extra_parameters }}
|
{{ vhost.extra_parameters }}
|
||||||
|
|
Loading…
Reference in a new issue