diff options
| author | Olivier Blin <dev@blino.org> | 2017-04-08 02:26:37 +0200 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2017-04-08 02:28:44 +0200 |
| commit | 02f389d10bc129c416b91ca29f5aa224d304fc24 (patch) | |
| tree | fd7f3b9a115d9b032c568ae6354a2d5d3b2a71f3 /modules | |
| parent | 6275f8034f2dc20d996fce320c4d48f693f0d1be (diff) | |
| download | puppet-02f389d10bc129c416b91ca29f5aa224d304fc24.tar puppet-02f389d10bc129c416b91ca29f5aa224d304fc24.tar.gz puppet-02f389d10bc129c416b91ca29f5aa224d304fc24.tar.bz2 puppet-02f389d10bc129c416b91ca29f5aa224d304fc24.tar.xz puppet-02f389d10bc129c416b91ca29f5aa224d304fc24.zip | |
apache: use apachectl configtest directly
"service httpd configtest" does not work with systemd
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/apache/manifests/base.pp | 2 | ||||
| -rw-r--r-- | modules/apache/manifests/config.pp | 2 | ||||
| -rw-r--r-- | modules/phpbb/manifests/redirection_instance.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp index d56e9100..a24040e3 100644 --- a/modules/apache/manifests/base.pp +++ b/modules/apache/manifests/base.pp @@ -25,7 +25,7 @@ class apache::base { subscribe => [ Package['apache-server'] ], } - exec { 'service httpd configtest': + exec { 'apachectl configtest': refreshonly => true, notify => Service['apache'], } diff --git a/modules/apache/manifests/config.pp b/modules/apache/manifests/config.pp index a6e1e231..0ff0962c 100644 --- a/modules/apache/manifests/config.pp +++ b/modules/apache/manifests/config.pp @@ -1,6 +1,6 @@ define apache::config($content) { file { $name: content => $content, - notify => Exec['service httpd configtest'], + notify => Exec['apachectl configtest'], } } diff --git a/modules/phpbb/manifests/redirection_instance.pp b/modules/phpbb/manifests/redirection_instance.pp index 9eb6bb8b..332eac53 100644 --- a/modules/phpbb/manifests/redirection_instance.pp +++ b/modules/phpbb/manifests/redirection_instance.pp @@ -2,6 +2,6 @@ define phpbb::redirection_instance($url) { $lang = $name file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_${name}.conf": content => template('phpbb/forums_redirect.conf'), - notify => Exec['service httpd configtest'], + notify => Exec['apachectl configtest'], } } |