[med-svn] r5818 - trunk/packages/ensembl/ensembl/57/debian

[Richard Holland]

Author: holland-guest
Date: 2011-01-30 12:49:03 +0000 (Sun, 30 Jan 2011)
New Revision: 5818

Modified:
   trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs
   trunk/packages/ensembl/ensembl/57/debian/ensembl.links
   trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst
   trunk/packages/ensembl/ensembl/57/debian/init.d
Log:
iFinal Ensembl tweaks, I think it installs now.


Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs	2011-01-30 12:36:08 UTC (rev 5817)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs	2011-01-30 12:49:03 UTC (rev 5818)
@@ -1,11 +1,11 @@
+etc/default/ensembl.d
 var
 var/log
 var/log/ensembl
-var/log
-usr/share/ensembl/logs
-etc/default/ensembl.d
 var/cache
 var/cache/ensembl
 var/cache/ensembl/img-cache
+var/tmp
+var/tmp/ensembl
 var/tmp/ensembl/img-tmp
 var/tmp/ensembl/tmp

Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.links
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2011-01-30 12:36:08 UTC (rev 5817)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2011-01-30 12:49:03 UTC (rev 5818)
@@ -1,4 +1,6 @@
-/usr/share/ensembl/logs /var/log/ensembl
-/usr/share/ensembl/img-cache /var/cache/ensembl/img-cache
-/usr/share/ensembl/img-tmp /var/tmp/ensembl/img-tmp
-/usr/share/ensembl/tmp /var/tmp/ensembl/tmp
+#Commented because tried to do it here but didn't work, so
+# we are using postinst instead
+#/usr/share/ensembl/logs /var/log/ensembl
+#/usr/share/ensembl/img-cache /var/cache/ensembl/img-cache
+#/usr/share/ensembl/img-tmp /var/tmp/ensembl/img-tmp
+#/usr/share/ensembl/tmp /var/tmp/ensembl/tmp

Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst	2011-01-30 12:36:08 UTC (rev 5817)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst	2011-01-30 12:49:03 UTC (rev 5818)
@@ -29,16 +29,20 @@
 			continue;
 		elif [ -L "$d" ]; then
 			# a presumed remnant of a previous installation pointing to /usr/share/ensembl
-			rm "$d"
+			rm -rf "$d"
 		elif [ -r "$d" ]; then
 			echo "File '$d' should be a directory - something is wrong."
 			exit 1;
 		fi
 		echo "Creating directory '$d'."
 		mkdir -p "$d"
-		chown nobody.nogroup "$d"
+		chown nobody:nogroup "$d"
 		chmod 755 "$d"
 	done
+	ln -sf /var/log/ensembl /usr/share/ensembl/logs 
+	ln -sf /var/cache/ensembl/img-cache /usr/share/ensembl/img-cache
+	ln -sf /var/tmp/ensembl/img-tmp /usr/share/ensembl/img-tmp
+	ln -sf /var/tmp/ensembl/tmp /usr/share/ensembl/tmp
 
 	echo "Enabling Apache modules."
 	a2enmod perl

Modified: trunk/packages/ensembl/ensembl/57/debian/init.d
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/init.d	2011-01-30 12:36:08 UTC (rev 5817)
+++ trunk/packages/ensembl/ensembl/57/debian/init.d	2011-01-30 12:49:03 UTC (rev 5818)
@@ -91,12 +91,12 @@
 		# /var/cache/ensembl/img-cache  # this is set as a symlink further down
 		# /var/tmp/ensembl/img-tmp      # another symlink set further down
 		# /var/tmp/ensembl/tmp          # and yet another one 
-		for d in /usr/share/ensembl/tmp  /var/cache/ensembl
-		do
-			if [ ! -d "$d" ]; then mkdir $d; fi
-			chown nobody:nogroup -R "$d"
-		 	chmod 755 "$d"
-		done
+		#for d in /usr/share/ensembl/tmp  /var/cache/ensembl
+		#do
+		#	if [ ! -d "$d" ]; then mkdir $d; fi
+		#	chown nobody:nogroup -R "$d"
+		# 	chmod 755 "$d"
+		#done
 
 		log_daemon_msg "Starting web server" "ensembl"
 		if $APACHE2CTL start; then