Browse Source

States for apache-reload and apache-restart using module.wait not working

tags/v0.37.4
Michal Galet 11 years ago
parent
commit
a3299dc1eb
4 changed files with 7 additions and 6 deletions
  1. +1
    -1
      apache/debian_full.sls
  2. +4
    -3
      apache/init.sls
  3. +1
    -1
      apache/register_site.sls
  4. +1
    -1
      apache/vhosts/standard.sls

+ 1
- 1
apache/debian_full.sls View File

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


+ 4
- 3
apache/init.sls View File

@@ -11,9 +11,10 @@ apache:

apache-reload:
module.wait:
- name: service.reload {{ apache.service }}
- name: service.reload
- m_name: {{ apache.service }}

apache-restart:
module.wait:
- name: service.restart {{ apache.service }}
- name: service.restart
- m_name: {{ apache.service }}

+ 1
- 1
apache/register_site.sls View File

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

{% endif %}
##########################################

+ 1
- 1
apache/vhosts/standard.sls View File

@@ -18,7 +18,7 @@ include:
- require:
- pkg: apache
- watch_in:
- cmd: apache-reload
- module: apache-reload

{% if grains.os_family == 'Debian' %}
a2ensite {{ id }}:

Loading…
Cancel
Save