From 5dc9d42ea6cb5b58cf5e79b80e364bf4add8fed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 11 Mar 2015 20:43:18 +0100
Subject: [PATCH] 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.
---
 apache/map.jinja | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apache/map.jinja b/apache/map.jinja
index 2f04647..b8d1cac 100644
--- a/apache/map.jinja
+++ b/apache/map.jinja
@@ -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'))) %}