From def448db2f789be602bf2c31af69ad5063d3d3e3 Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@widodh.nl>
Date: Fri, 21 Aug 2015 17:10:21 +0200
Subject: [PATCH] Files in sites-available should end with .conf under Ubuntu

---
 apache/register_site.sls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache/register_site.sls b/apache/register_site.sls
index 00a8135..97df321 100644
--- a/apache/register_site.sls
+++ b/apache/register_site.sls
@@ -15,14 +15,14 @@
 {{ a2modid }}:
   cmd.run:
 {% if pillar['apache']['register-site'][site]['state'] == 'enabled' %}
-    - unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
+    - unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}.conf
 {% else %}
-    - onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
+    - onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}.conf
 {% endif %}
     - order: 230
     - require:
       - pkg: apache
-      - file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}
+      - file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}.conf
 
 {% endif %}
 ##########################################