[aeolus-audrey-agent] Fix for BZ 816104 - Unable to ssh to the wordpress Apache machine

[Joseph J. VLcek]

commit aa1f014c5be2f7b43bdfb97ad85548e8a43d91e6
Author: Joe VLcek <jvlcek at redhat.com>
Date:   Wed Jul 25 11:33:21 2012 -0400

    Fix for BZ 816104 - Unable to ssh to the wordpress Apache machine

 aeolus-audrey-agent.spec |   27 +++++++++++++++++----------
 sources                  |    2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/aeolus-audrey-agent.spec b/aeolus-audrey-agent.spec
index 7432962..b551574 100644
--- a/aeolus-audrey-agent.spec
+++ b/aeolus-audrey-agent.spec
@@ -1,4 +1,4 @@
-#
+
 #   Copyright [2011] [Red Hat, Inc.]
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
 
 Name:       aeolus-audrey-agent
 Version:    0.5.0
-Release:    1%{?dist}.20120504194102git64749bf
+Release:    0%{?dist}.20120725144606gitc8375fa
 Summary:    The Aeolus Audrey Startup Agent
 
 Group:      Applications/System
@@ -75,17 +75,25 @@ install -m644 audrey.8 %{buildroot}%{_mandir}/man8
 if [ 0%{?rhel} == 05 ] || [ 0%{?rhel} == 06 ]; then
   # install the sysv service script
   mkdir -p %{buildroot}/%{_initrddir}
-  install -Dp -m755 scripts/audrey.sysv %{buildroot}%{_initrddir}/audrey
+  install -Dp -m755 scripts/audrey.sysv %{buildroot}%{_initrddir}/ZZaudrey
 else
   # install the systemd unit file
   mkdir -p %{buildroot}/%{_unitdir}/
   install -m644 scripts/audrey.service %{buildroot}/%{_unitdir}/
 fi
 
+%pre
+# this removes the audrey service
+# in prep for the ZZaudrey service
+# part of fix for BZ816104
+if [ -e %{_initrddir}/audrey ]; then
+/sbin/chkconfig --del audrey
+fi
+
 %post
 if [ 0%{?rhel} == 05 ] || [ 0%{?rhel} == 06 ]; then
-/sbin/chkconfig --add audrey
-/sbin/chkconfig audrey on
+/sbin/chkconfig --add ZZaudrey
+/sbin/chkconfig ZZaudrey on
 else
 /bin/systemctl enable audrey.service > /dev/null
 fi
@@ -94,7 +102,7 @@ fi
 %preun
 if [ "$1" = 0 ] ; then
 if [ 0%{?rhel} == 05 ] || [ 0%{?rhel} == 06 ]; then
-/sbin/chkconfig --del audrey
+/sbin/chkconfig --del ZZaudrey
 else
 /bin/systemctl disable audrey.service > /dev/null
 fi
@@ -106,16 +114,15 @@ fi
 %{python_sitelib}/audrey/*
 %{_mandir}/man8/audrey.8*
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
-%{_initrddir}/audrey
+%{_initrddir}/ZZaudrey
 %else
 %{_unitdir}/audrey.service
 %endif
 %doc COPYING
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-1.20120504194102git64749bf
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
+* Tue May 08 2012 Dan Radez <dradez at redhat.com> 0.4.6-1
+- fix for BZ816104
 * Fri Mar 16 2012 Joe VLcek <jvlcek at redhat.com> 0.4.4-4
 - Added auto cloud-info identification
 * Mon Mar 05 2012 Dan Radez <dradez at redhat.com> 0.4.4-3
diff --git a/sources b/sources
index 0bf050b..08845b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4063f187c2eff62a9cd20c92a4211e59  aeolus-audrey-agent-0.5.0.tar.gz
+0438e7d1328c11c661b43865f6b0fd9c  aeolus-audrey-agent-0.5.0.tar.gz