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

Merge pull request #14 from galet/master

Browse Source 
States for apache-reload and apache-restart using module.wait not working
This commit is contained in:
Joseph Hall 2014-01-04 04:58:07 -08:00
commit b118690c53
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/debian_full.sls
View File

@ -17,7 +17,7 @@ a2dissite 000-default:
- order: 225 - order: 225
- onlyif: ls /etc/apache2/sites-enabled/000-default - onlyif: ls /etc/apache2/sites-enabled/000-default
- watch_in: - watch_in:
- cmd: apache-reload - module: apache-reload
- require: - require:
- pkg: apache - pkg: apache

7
apache/init.sls
View File

@ -11,9 +11,10 @@ apache:
apache-reload: apache-reload:
module.wait: module.wait:
- name: service.reload {{ apache.service }} - name: service.reload
- m_name: {{ apache.service }}
apache-restart: apache-restart:
module.wait: module.wait:
- name: service.restart {{ apache.service }} - name: service.restart
- m_name: {{ apache.service }}

2
apache/register_site.sls
View File

@ -39,7 +39,7 @@ a2dissite {{ pillar['apache']['register-site'][site]['name'] }}:
- mode: 775 - mode: 775
- watch_in: - watch_in:
- cmd: a2ensite {{ pillar['apache']['register-site'][site]['name'] }} - cmd: a2ensite {{ pillar['apache']['register-site'][site]['name'] }}
- cmd: apache-reload - module: apache-reload
{% endif %} {% endif %}
########################################## ##########################################

2
apache/vhosts/standard.sls
View File

@ -18,7 +18,7 @@ include:
- require: - require:
- pkg: apache - pkg: apache
- watch_in: - watch_in:
- cmd: apache-reload - module: apache-reload
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
a2ensite {{ id }}: a2ensite {{ id }}: