SPECS: template-webapp.spec - cleanup template -- remove migration...

[glen]

Author: glen                         Date: Wed Apr 18 13:35:12 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup template -- remove migration triggers

---- Files affected:
SPECS:
   template-webapp.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.52 SPECS/template-webapp.spec:1.53
--- SPECS/template-webapp.spec:1.52	Sun Feb 25 14:43:31 2007
+++ SPECS/template-webapp.spec	Wed Apr 18 15:34:59 2007
@@ -84,92 +84,6 @@
 %triggerun -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
-%if 00000000000000000000000000000000000
-# SAMPLE TRIGGER FOR MIGRATION PURPOSES
-%triggerpostun -- %{name} < 1.3.9-1.4
-# rescue app configs. issue this in old config dir to get a list:
-# rpm -qfl .|grep `pwd`/|awk -F/ '{print $NF}'|egrep -v 'apache|httpd'|xargs
-for i in config.inc.php; do
-	if [ -f /etc/%{name}/$i.rpmsave ]; then
-		mv -f %{_sysconfdir}/$i{,.rpmnew}
-		mv -f /etc/%{name}/$i.rpmsave %{_sysconfdir}/$i
-	fi
-done
-
-# 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
-	httpd_reload=1
-fi
-
-# migrate from httpd (apache2) config dir
-if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-	mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
-	httpd_reload=1
-fi
-
-# migrate from apache-config macros
-if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
-	if [ -d /etc/apache/webapps.d ]; then
-		cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
-		cp -f /etc/%{name}/apache.conf.rpmsave %{_sysconfdir}/apache.conf
-	fi
-
-	if [ -d /etc/httpd/webapps.d ]; then
-		cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-		cp -f /etc/%{name}/apache.conf.rpmsave %{_sysconfdir}/httpd.conf
-	fi
-	rm -f /etc/%{name}/apache.conf.rpmsave
-fi
-
-# same but without separate %{_sysconfdir} for package
-if [ -f /etc/apache-%{name}.conf.rpmsave ]; then
-	if [ -d /etc/apache/webapps.d ]; then
-		cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
-		cp -f /etc/apache-%{name}.conf.rpmsave %{_sysconfdir}/apache.conf
-	fi
-
-	if [ -d /etc/httpd/webapps.d ]; then
-		cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-		cp -f /etc/apache-%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
-	fi
-	rm -f /etc/apache-%{name}.conf.rpmsave
-fi
-
-# update htpasswd path
-#sed -i -e 's,/etc/%{name},%{_webapps}/%{_webapp},' %{_webapps}/%{_webapp}/{apache,httpd}.conf
-
-# migrating from earlier apache-config?
-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
-		apache_reload=1
-	fi
-	if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
-		rm -f /etc/httpd/httpd.conf/99_%{name}.conf
-		httpd_reload=1
-	fi
-else
-	# no earlier registration. assume migration from Ra
-	if [ -d /etc/apache/webapps.d ]; then
-		apache_reload=1
-	fi
-	if [ -d /etc/httpd/webapps.d ]; then
-		httpd_reload=1
-	fi
-fi
-
-if [ "$apache_reload" ]; then
-	/usr/sbin/webapp register apache %{_webapp}
-	%service -q apache reload
-fi
-if [ "$httpd_reload" ]; then
-	/usr/sbin/webapp register httpd %{_webapp}
-	%service -q httpd reload
-fi
-%endif # END OF SAMPLE TRIGGER
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -188,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2007/04/18 13:34:59  glen
+- cleanup template -- remove migration triggers
+
 Revision 1.52  2007/02/25 13:43:31  glen
 - update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.52&r2=1.53&f=u