Author: glen Date: Wed Dec 28 06:58:16 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reload implies webapp register
---- Files affected:
SPECS:
template-webapp.spec (1.34 -> 1.35)
---- Diffs:
================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.34 SPECS/template-webapp.spec:1.35
--- SPECS/template-webapp.spec:1.34 Tue Dec 13 18:21:00 2005
+++ SPECS/template-webapp.spec Wed Dec 28 07:58:10 2005
@@ -86,7 +86,6 @@
# nuke very-old config location (this mostly for Ra)
if [ -f /etc/httpd/httpd.conf ]; then
sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
- /usr/sbin/webapp register httpd %{_webapp}
httpd_reload=1
fi
@@ -94,7 +93,6 @@
if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
- /usr/sbin/webapp register httpd %{_webapp}
httpd_reload=1
fi
@@ -130,36 +128,34 @@
if [ -L /etc/apache/conf.d/99_%{name}.conf ] || [ -L
/etc/httpd/httpd.conf/99_%{name}.conf ]; then
if [ -L /etc/apache/conf.d/99_%{name}.conf ]; then
rm -f /etc/apache/conf.d/99_%{name}.conf
- /usr/sbin/webapp register apache %{_webapp}
apache_reload=1
fi
if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
rm -f /etc/httpd/httpd.conf/99_%{name}.conf
- /usr/sbin/webapp register httpd %{_webapp}
httpd_reload=1
fi
else
# no earlier registration. assume migration from Ra
if [ -d /etc/apache/webapps.d ]; then
- /usr/sbin/webapp register apache %{_webapp}
apache_reload=1
fi
if [ -d /etc/httpd/webapps.d ]; then
- /usr/sbin/webapp register httpd %{_webapp}
httpd_reload=1
fi
fi
-if [ "$httpd_reload" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
-fi
if [ "$apache_reload" ]; then
+ /usr/sbin/webapp register apache %{_webapp}
if [ -f /var/lock/subsys/apache ]; then
/etc/rc.d/init.d/apache reload 1>&2
fi
fi
+if [ "$httpd_reload" ]; then
+ /usr/sbin/webapp register httpd %{_webapp}
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd reload 1>&2
+ fi
+fi
%endif # END OF SAMPLE TRIGGER
%clean
@@ -179,6 +175,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2005/12/28 06:58:10 glen
+- reload implies webapp register
+
Revision 1.34 2005/12/13 17:21:00 glen
- add most common group and %setup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.34&r2=1.35&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
