From df5edcd8a2a51aba12374ca8cd126fa8952153f1 Mon Sep 17 00:00:00 2001
From: Philipp Marmet <mail@nytoca.ch>
Date: Wed, 18 May 2016 13:01:05 +0200
Subject: [PATCH] Proper disabling of the default vhost

Removing the file /etc/apache2/sites-available/000-default.conf leads to an error when Apache is restarted.
So the symlink in /etc/apache2/sites-enabled/ should be removed, the actual file can stay.
---
 apache/no_default_vhost.sls | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apache/no_default_vhost.sls b/apache/no_default_vhost.sls
index ff52061..19bd1a8 100644
--- a/apache/no_default_vhost.sls
+++ b/apache/no_default_vhost.sls
@@ -5,12 +5,13 @@
 include:
   - apache
 
-apache_no-default-vhost:
-  file.absent:
-    - name: {{ apache.vhostdir }}/000-default.conf
+a2dissite 000-default.conf:
+  cmd:
+    - run
+    - unless: test ! -f /etc/apache2/sites-enabled/000-default.conf
     - require:
       - pkg: apache
     - watch_in:
       - module: apache-reload
 
-{% endif %}
\ No newline at end of file
+{% endif %}