Merge pull request #26 from vincentfretin/patch-1

Don't execute a2ensite if the vhost is already enabled

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:

apache/vhosts/standard.sls

@@ -24,6 +24,7 @@ include:
 a2ensite {{ id }}:
   cmd:
     - run
+    - unless: test -f /etc/apache2/sites-enabled/{{ id }}
     - require:
       - file: {{ id }}
     - watch_in: