From a07560a7eaf8cef6d8d7c2efa6855d0b99c18c92 Mon Sep 17 00:00:00 2001 From: Noel McLoughlin Date: Thu, 24 Aug 2017 20:58:37 +0100 Subject: [PATCH] Consolidate duplicate 'Location' stanzas in pillar.example; SLS Rendering Error fix --- pillar.example | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pillar.example b/pillar.example index 8969a2c..845a131 100644 --- a/pillar.example +++ b/pillar.example @@ -212,6 +212,14 @@ apache: /error: Require: 'all granted' + /docs: + Order: allow,deny # For Apache < 2.4 + Allow: from all # For apache < 2.4 + Require: all granted # For apache > 2.4. + Formula_Append: | + Additional config as a + multi-line string here + LocationMatch: '^[.\\/]+([Ww][Ee][Bb][Mm][Aa][Ii][Ll])[.\\/]': Require: False @@ -236,15 +244,6 @@ apache: Alias: /docs: /usr/share/docs - Location: - /docs: - Order: allow,deny # For Apache < 2.4 - Allow: from all # For apache < 2.4 - Require: all granted # For apache > 2.4. - Formula_Append: | - Additional config as a - multi-line string here - Formula_Append: | Additional config as a multi-line string here