summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2008-07-11 15:48:33 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2008-07-11 15:48:33 -0400
commit4037f9ba6266dfc70bc529d3c5152efb185b4299 (patch)
treed90e4f05f9d4f4c5bc0f5da94fa97676fd93eb3f
parentb497ca84b96152616a66fe9665460c751a859eb4 (diff)
downloadpuppet-django-4037f9ba6266dfc70bc529d3c5152efb185b4299.zip
puppet-django-4037f9ba6266dfc70bc529d3c5152efb185b4299.tar.gz
puppet-django-4037f9ba6266dfc70bc529d3c5152efb185b4299.tar.xz
Fixing httpd restart
-rw-r--r--manifests/init.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index fe5e9a5..3518628 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,6 +8,14 @@ class django::server {
require => Package["httpd"],
}
+ # If 'service httpd start' and 'service httpd restart' are run to closely
+ # together the restart will fail. This is a workaround.
+ exec { "graceful-apache":
+ command => "/sbin/service httpd graceful",
+ refreshonly => true,
+ require => Package["httpd"],
+ }
+
file { "/etc/httpd/conf.d/django.conf":
ensure => present,
owner => "root",
@@ -15,7 +23,7 @@ class django::server {
mode => 0644,
source => "puppet:///django/django.conf",
require => [Package["httpd"],Package["mod_python"], Exec["Checkout django example"]],
- notify => Service["httpd"],
+ notify => Exec["graceful-apache"],
}
exec { "Checkout django example":