Quellcode durchsuchen

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

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.
master
Raphaël Hertzog vor 9 Jahren
Ursprung
Commit
5dc9d42ea6
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. +4
    -4
      apache/map.jinja

+ 4
- 4
apache/map.jinja Datei anzeigen

@@ -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'))) %}

Laden…
Abbrechen
Speichern