saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FreeBSD: global DocumentRoot

Browse Source
This commit is contained in:
Alexander Weidinger 2016-09-27 02:00:41 +02:00
parent c7e533d7e5
commit 5d27226001
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache/files/FreeBSD/apache-2.4.config.jinja
View File

@ -230,13 +230,14 @@ ServerAdmin root@localhost
# below. # below.
# #
{% if apache.global_document_root is defined and apache.global_document_root|length > 0 %}
# #
# DocumentRoot: The directory out of which you will serve your # DocumentRoot: The directory out of which you will serve your
# documents. By default, all requests are taken from this directory, but # documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations. # symbolic links and aliases may be used to point to other locations.
# #
DocumentRoot "/usr/local/www/apache24/data" DocumentRoot "{{ apache.global_document_root }}"
<Directory "/usr/local/www/apache24/data"> <Directory "{{ apache.global_document_root }}">
# #
# Possible values for the Options directive are "None", "All", # Possible values for the Options directive are "None", "All",
# or any combination of: # or any combination of:
@ -263,6 +264,7 @@ DocumentRoot "/usr/local/www/apache24/data"
# #
Require all granted Require all granted
</Directory> </Directory>
{% endif %}
# #
# DirectoryIndex: sets the file that Apache will serve if a directory # DirectoryIndex: sets the file that Apache will serve if a directory

2
apache/map.jinja
View File

@ -90,6 +90,8 @@
'vhostdir': '/usr/local/etc/apache22/Includes', 'vhostdir': '/usr/local/etc/apache22/Includes',
'confdir': '/usr/local/etc/apache22/Includes', 'confdir': '/usr/local/etc/apache22/Includes',
'modulesdir': '/usr/local/etc/apache22/modules.d', 'modulesdir': '/usr/local/etc/apache22/modules.d',
'global_document_root': '/usr/local/www/apache22/data',
'confext': '', 'confext': '',
'default_site': 'default', 'default_site': 'default',
'default_site_ssl': 'default-ssl', 'default_site_ssl': 'default-ssl',