[PATCH Audrey 2/2] Fix for https://bugzilla.redhat.com/show_bug.cgi?id=768425
gblomqui at redhat.com
gblomqui at redhat.com
Fri Dec 16 16:50:02 UTC 2011
From: Greg Blomquist <gblomqui at redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=768425
This bug shows up every several runs of aeolus-configserver-setup. The result
is that Puppet fails to leave Apache in a "running" state after running through
the setup.
This fix forces several additional configuration steps to execute _before_
attempting to notify Apache to start. Namely, the configuration of selinux and
the firewall.
---
configserver/aeolus-configserver.spec.in | 5 +++--
.../puppet/modules/apache/manifests/init.pp | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/configserver/aeolus-configserver.spec.in b/configserver/aeolus-configserver.spec.in
index 465e849..e5458cb 100644
--- a/configserver/aeolus-configserver.spec.in
+++ b/configserver/aeolus-configserver.spec.in
@@ -17,7 +17,7 @@
Name: aeolus-configserver
Version: @VERSION@
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Aeolus Config Server
Group: Applications/System
@@ -169,8 +169,9 @@ fi
%doc COPYING
%changelog
-* Fri Dec 16 2011 Greg Blomquist <gblomqui at redhat.com> 0.4.4-1
+* Fri Dec 16 2011 Greg Blomquist <gblomqui at redhat.com> 0.4.4-2
- https://bugzilla.redhat.com/show_bug.cgi?id=760377
+- https://bugzilla.redhat.com/show_bug.cgi?id=768425
* Mon Dec 12 2011 Greg Blomquist <gblomqui at redhat.com> 0.4.3-2
- Fix 500 on audrey-agent HTTP PUT of partial params
- https://bugzilla.redhat.com/show_bug.cgi?id=766967
diff --git a/configserver/configure/puppet/modules/apache/manifests/init.pp b/configserver/configure/puppet/modules/apache/manifests/init.pp
index 27c33c0..6ce6f86 100644
--- a/configserver/configure/puppet/modules/apache/manifests/init.pp
+++ b/configserver/configure/puppet/modules/apache/manifests/init.pp
@@ -31,7 +31,8 @@ class apache {
command => "/usr/sbin/setsebool -P httpd_can_network_connect 1",
logoutput => true,
unless => "/usr/bin/test 'Disabled' = `/usr/sbin/getenforce`",
- require => Package["apache"]
+ require => Package["apache"],
+ notify => Exec["graceful-apache"],
}
exec { "graceful-apache":
@@ -92,12 +93,14 @@ class apache {
ensure => directory,
mode => 0644, owner => root, group => root,
require => Package["apache"],
+ notify => Exec["graceful-apache"]
}
exec { "config-iptables-for-443":
command => "/sbin/iptables -I INPUT -m state --state NEW -m tcp -p tcp --dport 443 -j ACCEPT",
logoutput => true,
- require => Package["apache"]
+ require => Package["apache"],
+ notify => Exec["graceful-apache"]
}
}
@@ -118,6 +121,7 @@ class apache {
ensure => directory,
mode => 0644, owner => root, group => root,
require => Package["apache"],
+ notify => Exec["graceful-apache"]
}
}
}
--
1.7.7.4
More information about the aeolus-devel
mailing list