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

Merge pull request #194 from saltstack-formulas/fix-pillar

Browse Source 
Consolidate duplicate 'Location' stanzas in pillar.example
This commit is contained in:
Niels Abspoel 2017-08-24 22:19:35 +02:00 committed by GitHub
commit 72dc03a4e7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pillar.example
View File

@ -212,6 +212,14 @@ apache:
/error: /error:
Require: 'all granted' 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: LocationMatch:
'^[.\\/]+([Ww][Ee][Bb][Mm][Aa][Ii][Ll])[.\\/]': '^[.\\/]+([Ww][Ee][Bb][Mm][Aa][Ii][Ll])[.\\/]':
Require: False Require: False
@ -236,15 +244,6 @@ apache:
Alias: Alias:
/docs: /usr/share/docs /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: | Formula_Append: |
Additional config as a Additional config as a
multi-line string here multi-line string here