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

Update map.ninja to rely on oscodename grain instead of lsb_distrib_release

Browse Source 
This is more reliable than version numbers which might change with point
releases (in particular for Debian Jessie) and is more likely to not
conflict between multiple OS.
This commit is contained in:
Raphaël Hertzog 2015-03-11 20:43:18 +01:00
parent 93745004ca
commit 5dc9d42ea6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache/map.jinja
View File

@ -60,23 +60,23 @@
'use_require': False,
},
}, merge=salt['grains.filter_by']({
'14.04': {
'trusty': {
'confext': '.conf',
'default_site': '000-default.conf',
'default_site_ssl': 'default-ssl.conf',
'use_require': True,
},
'14.10': {
'utopic': {
'confext': '.conf',
'default_site': '000-default.conf',
'default_site_ssl': 'default-ssl.conf',
'use_require': True,
},
'8.0': {
'jessie': {
'wwwdir': '/var/www',
'confext': '.conf',
'default_site': '000-default.conf',
'default_site_ssl': 'default-ssl.conf',
'use_require': True,
},
}, grain='lsb_distrib_release', merge=salt['pillar.get']('apache:lookup'))) %}
}, grain='oscodename', merge=salt['pillar.get']('apache:lookup'))) %}