diff --git a/apache/no_default_vhost.sls b/apache/no_default_vhost.sls index 19bd1a8..f316b9e 100644 --- a/apache/no_default_vhost.sls +++ b/apache/no_default_vhost.sls @@ -6,8 +6,7 @@ include: - apache a2dissite 000-default.conf: - cmd: - - run + cmd.run: - unless: test ! -f /etc/apache2/sites-enabled/000-default.conf - require: - pkg: apache diff --git a/apache/vhosts/standard.sls b/apache/vhosts/standard.sls index ccfc736..f0db05d 100644 --- a/apache/vhosts/standard.sls +++ b/apache/vhosts/standard.sls @@ -34,8 +34,7 @@ include: {% if grains.os_family == 'Debian' %} {% if site.get('enabled', True) %} a2ensite {{ id }}{{ apache.confext }}: - cmd: - - run + cmd.run: - unless: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - require: - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }} @@ -43,8 +42,7 @@ a2ensite {{ id }}{{ apache.confext }}: - module: apache-reload {% else %} a2dissite {{ id }}{{ apache.confext }}: - cmd: - - run + cmd.run: - onlyif: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - require: - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }}