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

Merge pull request #231 from ze42/directory_default

Browse Source 
vhosts/standard: Directory_default to DocumentRoot
This commit is contained in:
N 2018-08-29 11:44:17 +01:00 committed by GitHub
commit 8adcad3db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/vhosts/standard.tmpl
View File

@ -28,7 +28,7 @@
'Timeout': site.get('Timeout'), 'Timeout': site.get('Timeout'),
'LimitRequestFields': site.get('LimitRequestFields'), 'LimitRequestFields': site.get('LimitRequestFields'),
'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename), 'Directory_default': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)),
'Directory': { 'Directory': {
'Options': '-Indexes +FollowSymLinks', 'Options': '-Indexes +FollowSymLinks',
'Order': 'allow,deny', 'Order': 'allow,deny',

2
pillar.example
View File

@ -84,7 +84,7 @@ apache:
SSLCertificateChainFile: /etc/ssl/mycert.chain.pem # if you require a chain of server certificates file SSLCertificateChainFile: /etc/ssl/mycert.chain.pem # if you require a chain of server certificates file
Directory: Directory:
# "default" is a special case; Adds ``/path/to/www/dir/example.com`` # "default" is a special case; uses DocumentRoot value
# E.g.: /var/www/example.com # E.g.: /var/www/example.com
default: default:
Options: -Indexes +FollowSymLinks Options: -Indexes +FollowSymLinks