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

Merge pull request #16 from bechtoldt/improvements

Browse Source 
setting the remaining changes caused by the change to module.wait
This commit is contained in:
Seth House 2014-01-08 07:29:15 -08:00
commit b1e2d39849
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/fcgid.sls
View File

@ -17,6 +17,6 @@ a2enmod fcgid:
- require: - require:
- pkg: mod-fcgid - pkg: mod-fcgid
- watch_in: - watch_in:
- cmd: apache-restart - module: apache-restart
{% endif %} {% endif %}

4
apache/php5.sls
View File

@ -18,7 +18,7 @@ a2enmod php5:
- require: - require:
- pkg: mod-php5 - pkg: mod-php5
- watch_in: - watch_in:
- cmd: apache-restart - module: apache-restart
{% if 'apache' in pillar and 'php-ini' in pillar['apache'] %} {% if 'apache' in pillar and 'php-ini' in pillar['apache'] %}
/etc/php5/apache2/php.ini: /etc/php5/apache2/php.ini:
@ -26,7 +26,7 @@ a2enmod php5:
- source: {{ pillar['apache']['php-ini'] }} - source: {{ pillar['apache']['php-ini'] }}
- order: 225 - order: 225
- watch_in: - watch_in:
- cmd: apache-restart - module: apache-restart
- require: - require:
- pkg: apache - pkg: apache
- pkg: php5 - pkg: php5

2
apache/rewrite.sls
View File

@ -11,6 +11,6 @@ a2enmod rewrite:
- require: - require:
- pkg: apache - pkg: apache
- watch_in: - watch_in:
- cmd: apache-restart - module: apache-restart
{% endif %} {% endif %}

2
apache/vhost_alias.sls
View File

@ -11,6 +11,6 @@ a2enmod vhost_alias:
- require: - require:
- pkg: apache - pkg: apache
- watch_in: - watch_in:
- cmd: apache-restart - module: apache-restart
{% endif %} {% endif %}

2
apache/vhosts/standard.sls
View File

@ -27,7 +27,7 @@ a2ensite {{ id }}:
- require: - require:
- file: {{ id }} - file: {{ id }}
- watch_in: - watch_in:
- cmd: apache-reload - module: apache-reload
{% endif %} {% endif %}
{% endfor %} {% endfor %}