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

[Richard Holland]

Author: holland-guest
Date: 2011-01-29 20:53:36 +0000 (Sat, 29 Jan 2011)
New Revision: 5771

Added:
   trunk/packages/ensembl/ensembl/57/debian/ensembl.templates
Removed:
   trunk/packages/ensembl/ensembl/57/debian/templates
Modified:
   trunk/packages/ensembl/ensembl/57/debian/init.d
Log:
More Ensembl tricks.


Copied: trunk/packages/ensembl/ensembl/57/debian/ensembl.templates (from rev 5763, trunk/packages/ensembl/ensembl/57/debian/templates)
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.templates	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.templates	2011-01-29 20:53:36 UTC (rev 5771)
@@ -0,0 +1,54 @@
+Template: ensembl/port
+Default: 80
+Type: string
+Description: Port that Apache will listen on.
+
+Template: ensembl/webuserdbhost
+Default: localhost
+Type: string
+Description: MySQL server for web user db.
+
+Template: ensembl/webuserdbport
+Default: 3306
+Type: string
+Description: MySQL port for web user db.
+
+Template: ensembl/webuserdbname
+Default: ensembl
+Type: string
+Description: MySQL database name for web user db.
+
+Template: ensembl/webuserdbuser
+Default: ensembl
+Type: string
+Description: MySQL username for web user db.
+
+Template: ensembl/webuserdbpwd
+Default: ensembl
+Type: string
+Description: MySQL password for web user db.
+
+Template: ensembl/webuserdbexistyn
+Default: false
+Type: boolean
+Description: True if the web user db already exists.
+
+Template: ensembl/webuserdbkeepyn
+Default: true
+Type: boolean
+Description: True if the web user db already exists and should be kept.
+
+Template: ensembl/mysqladminuser
+Default: root
+Type: string
+Description: MySQL admin user for creating the web user db if it doesn't exist.
+
+Template: ensembl/mysqladminpwd
+Default: 
+Type: password
+Description: MySQL admin password for creating the web user db if it doesn't exist.
+
+Template: ensembl/webuserdbkeeptablesyn
+Default: true
+Type: boolean
+Description: True if the web user db already exists and the data in it should be kept.

Modified: trunk/packages/ensembl/ensembl/57/debian/init.d
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/init.d	2011-01-29 20:51:48 UTC (rev 5770)
+++ trunk/packages/ensembl/ensembl/57/debian/init.d	2011-01-29 20:53:36 UTC (rev 5771)
@@ -91,9 +91,9 @@
 		# /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 /var/cache/ensembl/img-cache /var/tmp/ensembl/img-tmp /var/tmp/ensembl/tmp
+		for d in /usr/share/ensembl/tmp  /var/cache/ensembl
 		do
-			chown nobody:nogroup "$d"
+			chown nobody:nogroup -R "$d"
 		 	chmod 755 "$d"
 		done
 

Deleted: trunk/packages/ensembl/ensembl/57/debian/templates
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/templates	2011-01-29 20:51:48 UTC (rev 5770)
+++ trunk/packages/ensembl/ensembl/57/debian/templates	2011-01-29 20:53:36 UTC (rev 5771)
@@ -1,54 +0,0 @@
-Template: ensembl/port
-Default: 80
-Type: string
-Description: Port that Apache will listen on.
-
-Template: ensembl/webuserdbhost
-Default: localhost
-Type: string
-Description: MySQL server for web user db.
-
-Template: ensembl/webuserdbport
-Default: 3306
-Type: string
-Description: MySQL port for web user db.
-
-Template: ensembl/webuserdbname
-Default: ensembl
-Type: string
-Description: MySQL database name for web user db.
-
-Template: ensembl/webuserdbuser
-Default: ensembl
-Type: string
-Description: MySQL username for web user db.
-
-Template: ensembl/webuserdbpwd
-Default: ensembl
-Type: string
-Description: MySQL password for web user db.
-
-Template: ensembl/webuserdbexistyn
-Default: false
-Type: boolean
-Description: True if the web user db already exists.
-
-Template: ensembl/webuserdbkeepyn
-Default: true
-Type: boolean
-Description: True if the web user db already exists and should be kept.
-
-Template: ensembl/mysqladminuser
-Default: root
-Type: string
-Description: MySQL admin user for creating the web user db if it doesn't exist.
-
-Template: ensembl/mysqladminpwd
-Default: 
-Type: password
-Description: MySQL admin password for creating the web user db if it doesn't exist.
-
-Template: ensembl/webuserdbkeeptablesyn
-Default: true
-Type: boolean
-Description: True if the web user db already exists and the data in it should be kept.