saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use default style for cmd.run: instead of cmd: - run

Browse Source
This commit is contained in:
Philipp Marmet 2016-05-18 17:04:41 +02:00
parent df5edcd8a2
commit 01c9ca4a56
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache/no_default_vhost.sls
View File

@ -6,8 +6,7 @@ include:
- apache - apache
a2dissite 000-default.conf: a2dissite 000-default.conf:
cmd: cmd.run:
- run
- unless: test ! -f /etc/apache2/sites-enabled/000-default.conf - unless: test ! -f /etc/apache2/sites-enabled/000-default.conf
- require: - require:
- pkg: apache - pkg: apache

6
apache/vhosts/standard.sls
View File

@ -34,8 +34,7 @@ include:
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
{% if site.get('enabled', True) %} {% if site.get('enabled', True) %}
a2ensite {{ id }}{{ apache.confext }}: a2ensite {{ id }}{{ apache.confext }}:
cmd: cmd.run:
- run
- unless: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - unless: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }}
- require: - require:
- file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }} - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }}
@ -43,8 +42,7 @@ a2ensite {{ id }}{{ apache.confext }}:
- module: apache-reload - module: apache-reload
{% else %} {% else %}
a2dissite {{ id }}{{ apache.confext }}: a2dissite {{ id }}{{ apache.confext }}:
cmd: cmd.run:
- run
- onlyif: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - onlyif: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }}
- require: - require:
- file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }} - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }}