[pkg-java] r2778 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-21 12:06:10 +0100 (Tue, 21 Nov 2006)
New Revision: 2778

Modified:
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.install
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.links
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
Log:
Further changes to move webapps to /usr/share/tomcat5.5-webapps.


Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs	2006-11-21 10:35:24 UTC (rev 2777)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs	2006-11-21 11:06:10 UTC (rev 2778)
@@ -6,5 +6,5 @@
 var/lib/tomcat5.5/shared/classes
 var/lib/tomcat5.5/shared/lib
 var/lib/tomcat5.5/temp
-var/lib/tomcat5.5/webapps/ROOT/WEB-INF
+var/lib/tomcat5.5/webapps
 var/log/tomcat5.5

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.install	2006-11-21 10:35:24 UTC (rev 2777)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.install	2006-11-21 11:06:10 UTC (rev 2778)
@@ -1,7 +1,6 @@
 build/dist/bin	 				/usr/share/tomcat5.5
 build/dist/conf					/var/lib/tomcat5.5
 build/dist/conf/tomcat-users.xml  		/usr/share/tomcat5.5/.debian/
-build/dist/webapps/ROOT/WEB-INF/web.xml		/usr/share/tomcat5.5/.debian/
 build/dist/conf/web.xml				/etc/tomcat5.5/
 debian/policy/0*.policy				/etc/tomcat5.5/policy.d/
 debian/policy/9*.policy				/etc/tomcat5.5/policy.d/

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.links
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.links	2006-11-21 10:35:24 UTC (rev 2777)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.links	2006-11-21 11:06:10 UTC (rev 2778)
@@ -1,7 +1,6 @@
 /var/lib/tomcat5.5/conf			/usr/share/tomcat5.5/conf
 /usr/share/doc/tomcat5.5		/usr/share/tomcat5.5/doc
 /var/lib/tomcat5.5/logs			/usr/share/tomcat5.5/logs
-/var/lib/tomcat5.5/webapps		/usr/share/tomcat5.5/webapps
 /var/lib/tomcat5.5/work			/usr/share/tomcat5.5/work
 /var/lib/tomcat5.5/shared		/usr/share/tomcat5.5/shared
 /var/lib/tomcat5.5/temp			/usr/share/tomcat5.5/temp

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst	2006-11-21 10:35:24 UTC (rev 2777)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst	2006-11-21 11:06:10 UTC (rev 2778)
@@ -7,16 +7,11 @@
 		--ingroup nogroup --disabled-password --shell /bin/false \
 		tomcat55
 	fi
+	chown -R tomcat55:nogroup /var/log/tomcat5.5 /var/cache/tomcat5.5
 	chown tomcat55:adm /var/log/tomcat5.5 /var/cache/tomcat5.5 \
 	    /var/lib/tomcat5.5/conf
 	chmod 750 /var/log/tomcat5.5 /var/lib/tomcat5.5/conf
 	chmod 700 /var/cache/tomcat5.5
-	if [ ! -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml ]; then
-	    echo "Installing /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml."
-	    install -o root -g root -m 644 \
-		/usr/share/tomcat5.5/.debian/web.xml \
-		/var/lib/tomcat5.5/webapps/ROOT/WEB-INF/
-	fi
 	if [ ! -f /var/lib/tomcat5.5/conf/tomcat-users.xml ]; then
 	    echo "Installing /var/lib/tomcat5.5/conf/tomcat-users.xml."
 	    install -o tomcat55 -g adm -m 600 \

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-21 10:35:24 UTC (rev 2777)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-21 11:06:10 UTC (rev 2778)
@@ -11,11 +11,8 @@
 	# /var/lib/tomcat5.5 because there might be user-installed webapps)
 	userdel tomcat55 || true
 	rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
-	rm -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml
-	rmdir --ignore-fail-on-non-empty \
-	    /var/lib/tomcat5.5/webapps/ROOT/WEB-INF \
-	    /var/lib/tomcat5.5/webapps/ROOT /var/lib/tomcat5.5/webapps \
-	    /var/lib/tomcat5.5 2>/dev/null || true
+	rmdir --ignore-fail-on-non-empty /var/lib/tomcat5.5/webapps \
+	    /var/lib/tomcat5.5
 	rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5
     # remove user tomcat5 if package tomcat5 is 
     # marked as purged or has never been installed