From 9e9d6ba4bab3e683c3d84f6a68f01c0ba22d3e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Br=C3=A9fort?= <adrien@padisha.org>
Date: Sun, 22 Nov 2015 12:05:53 +0100
Subject: [PATCH] Add support for Ubuntu 15.04 and 15.10 in map.jinja.

---
 apache/map.jinja | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apache/map.jinja b/apache/map.jinja
index 1276952..b0c911f 100644
--- a/apache/map.jinja
+++ b/apache/map.jinja
@@ -85,6 +85,18 @@
         'default_site_ssl': 'default-ssl.conf',
         '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': {
         'wwwdir': '/var/www',
         'confext': '.conf',
@@ -95,4 +107,3 @@
 }, grain='oscodename', merge=salt['grains.filter_by'](
     osfingermap
 , grain='osfinger', merge=salt['pillar.get']('apache:lookup')))) %}
-