- cleanup template -- remove migration triggers

Changed files:
    webapp.spec -> 1.53

diff --git a/webapp.spec b/webapp.spec
index 4251ad86b13950d0f6a38f59ca14d6be78cac24d..07e3c89265f787cae0ecda2634115505c26a2623 100644 (file)
--- a/webapp.spec
+++ b/webapp.spec
@@ -83,92 +83,6 @@ install lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 %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