libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2024-12-22 11:00:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Actually fixes #28: Allow for virtualhost without documentroot.

Browse source
This commit is contained in:
Jeff Geerling 2016-01-02 22:46:25 -06:00
parent 2f9c001145
commit 554c74730c
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/vhosts-2.2.conf.j2
View file

@ -14,12 +14,14 @@
{% if vhost.serveradmin is defined %} {% if vhost.serveradmin is defined %}
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
AllowOverride All AllowOverride All
Options -Indexes FollowSymLinks Options -Indexes FollowSymLinks
Order allow,deny Order allow,deny
Allow from all Allow from all
</Directory> </Directory>
{% endif %}
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
{% endif %} {% endif %}
@ -34,7 +36,9 @@
{% if vhost.serveralias is defined %} {% if vhost.serveralias is defined %}
ServerAlias {{ vhost.serveralias }} ServerAlias {{ vhost.serveralias }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
DocumentRoot {{ vhost.documentroot }} DocumentRoot {{ vhost.documentroot }}
{% endif %}
SSLEngine on SSLEngine on
SSLCipherSuite {{ apache_ssl_cipher_suite }} SSLCipherSuite {{ apache_ssl_cipher_suite }}
@ -49,12 +53,14 @@
{% if vhost.serveradmin is defined %} {% if vhost.serveradmin is defined %}
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
AllowOverride All AllowOverride All
Options -Indexes FollowSymLinks Options -Indexes FollowSymLinks
Order allow,deny Order allow,deny
Allow from all Allow from all
</Directory> </Directory>
{% endif %}
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
{% endif %} {% endif %}

6
templates/vhosts-2.4.conf.j2
View file

@ -14,11 +14,13 @@
{% if vhost.serveradmin is defined %} {% if vhost.serveradmin is defined %}
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
AllowOverride All AllowOverride All
Options -Indexes +FollowSymLinks Options -Indexes +FollowSymLinks
Require all granted Require all granted
</Directory> </Directory>
{% endif %}
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
{% endif %} {% endif %}
@ -33,7 +35,9 @@
{% if vhost.serveralias is defined %} {% if vhost.serveralias is defined %}
ServerAlias {{ vhost.serveralias }} ServerAlias {{ vhost.serveralias }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
DocumentRoot {{ vhost.documentroot }} DocumentRoot {{ vhost.documentroot }}
{% endif %}
SSLEngine on SSLEngine on
SSLCipherSuite {{ apache_ssl_cipher_suite }} SSLCipherSuite {{ apache_ssl_cipher_suite }}
@ -49,11 +53,13 @@
{% if vhost.serveradmin is defined %} {% if vhost.serveradmin is defined %}
ServerAdmin {{ vhost.serveradmin }} ServerAdmin {{ vhost.serveradmin }}
{% endif %} {% endif %}
{% if vhost.documentroot is defined %}
<Directory "{{ vhost.documentroot }}"> <Directory "{{ vhost.documentroot }}">
AllowOverride All AllowOverride All
Options -Indexes +FollowSymLinks Options -Indexes +FollowSymLinks
Require all granted Require all granted
</Directory> </Directory>
{% endif %}
{% if vhost.extra_parameters is defined %} {% if vhost.extra_parameters is defined %}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
{% endif %} {% endif %}