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

Merge pull request #77 from bradthurber/add_apache_version

Browse Source 
Add apache version to pillar/map.jinja
This commit is contained in:
puneet kandhari 2015-08-26 08:15:11 -05:00
commit d01b7cc66e
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache/map.jinja
View File

@ -1,3 +1,5 @@
{% import_yaml "apache/osfingermap.yaml" as osfingermap %}
{% set apache = salt['grains.filter_by']({ {% set apache = salt['grains.filter_by']({
'Debian': { 'Debian': {
'server': 'apache2', 'server': 'apache2',
@ -88,4 +90,7 @@
'default_site_ssl': 'default-ssl.conf', 'default_site_ssl': 'default-ssl.conf',
'use_require': True, 'use_require': True,
}, },
}, grain='oscodename', merge=salt['pillar.get']('apache:lookup'))) %} }, grain='oscodename', merge=salt['grains.filter_by'](
osfingermap
, grain='osfinger', merge=salt['pillar.get']('apache:lookup')))) %}

6
apache/osfingermap.yaml Normal file
View File

@ -0,0 +1,6 @@
default:
version: '2.4'
Red Hat Enterprise Linux Server-6:
version: '2.2'
Red Hat Enterprise Linux Server-7:
version: '2.4'

3
pillar.example
View File

@ -12,6 +12,9 @@ apache:
logdir: /var/log/apache2 logdir: /var/log/apache2
wwwdir: /srv/apache2 wwwdir: /srv/apache2
# apache version (generally '2.2' or '2.4')
version: '2.2'
# ``apache.mod_wsgi`` formula additional configuration: # ``apache.mod_wsgi`` formula additional configuration:
mod_wsgi: mod_wsgi mod_wsgi: mod_wsgi