Browse Source

Merge pull request #231 from ze42/directory_default

vhosts/standard: Directory_default to DocumentRoot
master
N 6 years ago
parent
commit
8adcad3db8
No account linked to committer's email address
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      apache/vhosts/standard.tmpl
  2. +1
    -1
      pillar.example

+ 1
- 1
apache/vhosts/standard.tmpl View File

'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',

+ 1
- 1
pillar.example View File

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

Loading…
Cancel
Save