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

Merge pull request #92 from abrefort/master

Browse Source 
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
This commit is contained in:
puneet kandhari 2015-11-22 06:34:07 -06:00
commit 52af4e1ca4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache/map.jinja
View File

@ -85,6 +85,18 @@
'default_site_ssl': 'default-ssl.conf', 'default_site_ssl': 'default-ssl.conf',
'use_require': True, 'use_require': True,
}, },
'vivid': {
'confext': '.conf',
'default_site': '000-default.conf',
'default_site_ssl': 'default-ssl.conf',
'use_require': True,
},
'wily': {
'confext': '.conf',
'default_site': '000-default.conf',
'default_site_ssl': 'default-ssl.conf',
'use_require': True,
},
'jessie': { 'jessie': {
'wwwdir': '/var/www', 'wwwdir': '/var/www',
'confext': '.conf', 'confext': '.conf',
@ -95,4 +107,3 @@
}, grain='oscodename', merge=salt['grains.filter_by']( }, grain='oscodename', merge=salt['grains.filter_by'](
osfingermap osfingermap
, grain='osfinger', merge=salt['pillar.get']('apache:lookup')))) %} , grain='osfinger', merge=salt['pillar.get']('apache:lookup')))) %}