From 18d8c0c0fb3f36b4012bd42b02391fecb67d9426 Mon Sep 17 00:00:00 2001
From: vincentfretin <vincent.fretin@gmail.com>
Date: Fri, 1 Aug 2014 10:43:04 +0200
Subject: [PATCH 1/3] Don't execute a2ensite if the vhost is already enabled

---
 apache/vhosts/standard.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apache/vhosts/standard.sls b/apache/vhosts/standard.sls
index 51f644d..8cd0695 100644
--- a/apache/vhosts/standard.sls
+++ b/apache/vhosts/standard.sls
@@ -24,6 +24,7 @@ include:
 a2ensite {{ id }}:
   cmd:
     - run
+    - unless: ls /etc/apache2/sites-enabled/{{ id }}
     - require:
       - file: {{ id }}
     - watch_in:

From 0aec048eaf302aa370741d1004fd3f7c3b0764f1 Mon Sep 17 00:00:00 2001
From: Vincent Fretin <vincent.fretin@gmail.com>
Date: Fri, 1 Aug 2014 15:32:40 +0200
Subject: [PATCH 2/3] use test -f instead of ls

---
 apache/vhosts/standard.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache/vhosts/standard.sls b/apache/vhosts/standard.sls
index 8cd0695..9650c70 100644
--- a/apache/vhosts/standard.sls
+++ b/apache/vhosts/standard.sls
@@ -24,7 +24,7 @@ include:
 a2ensite {{ id }}:
   cmd:
     - run
-    - unless: ls /etc/apache2/sites-enabled/{{ id }}
+    - unless: test -f /etc/apache2/sites-enabled/{{ id }}
     - require:
       - file: {{ id }}
     - watch_in:

From 541360a0cee05b56e9922e912add2f5faf3b1d57 Mon Sep 17 00:00:00 2001
From: Vincent Fretin <vincent.fretin@gmail.com>
Date: Fri, 1 Aug 2014 15:39:32 +0200
Subject: [PATCH 3/3] use test -f instead of ls in register_site.sls too

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

diff --git a/apache/register_site.sls b/apache/register_site.sls
index e5a4129..29e0dab 100644
--- a/apache/register_site.sls
+++ b/apache/register_site.sls
@@ -14,9 +14,9 @@ a2dissite {{ pillar['apache']['register-site'][site]['name'] }}:
 {% endif %}
   cmd.run:
 {% if pillar['apache']['register-site'][site]['state'] == 'enabled' %}
-    - unless: ls /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
+    - unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
 {% else %}
-    - onlyif: ls /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
+    - onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
 {% endif %}
     - order: 230
     - require: