From 70ae79b99159aa660fbe893efc599d98dd026d10 Mon Sep 17 00:00:00 2001 From: "Adrien \"ze\" Urban" Date: Tue, 3 Jul 2018 11:34:20 +0200 Subject: [PATCH 1/2] vhosts/standard: Directory_default to DocumentRoot --- apache/vhosts/standard.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index af6c75e..ff79e1f 100644 --- a/apache/vhosts/standard.tmpl +++ b/apache/vhosts/standard.tmpl @@ -28,7 +28,7 @@ 'Timeout': site.get('Timeout'), 'LimitRequestFields': site.get('LimitRequestFields'), - 'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename), + 'Directory_default': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)), 'Directory': { 'Options': '-Indexes +FollowSymLinks', 'Order': 'allow,deny', From 49dedb64dceb39f5cdcb7d541a917375de60c3c8 Mon Sep 17 00:00:00 2001 From: "Adrien \"ze\" Urban" Date: Wed, 29 Aug 2018 12:19:43 +0200 Subject: [PATCH 2/2] directory.default: update pillar.example New behavior properly explained in pillar.example Warning: changes directory.default when used with non-standard documentroot. Now uses documentroot, instead of previously "default" documentroot path. --- pillar.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 4bf2a51..bfbd68e 100644 --- a/pillar.example +++ b/pillar.example @@ -84,7 +84,7 @@ apache: SSLCertificateChainFile: /etc/ssl/mycert.chain.pem # if you require a chain of server certificates file 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 default: Options: -Indexes +FollowSymLinks