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

[Richard Holland]

Author: holland-guest
Date: 2011-01-29 20:30:25 +0000 (Sat, 29 Jan 2011)
New Revision: 5763

Added:
   trunk/packages/ensembl/ensembl/57/debian/templates
Removed:
   trunk/packages/ensembl/ensembl/57/debian/ensembl.templates
Modified:
   trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst
Log:
Template attempt at Ensembl.


Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst	2011-01-29 20:18:25 UTC (rev 5762)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.postinst	2011-01-29 20:30:25 UTC (rev 5763)
@@ -52,7 +52,9 @@
         cp -f /etc/default/ensembl.d/pluginSiteDefs.pm /usr/share/ensembl/public-plugins/mirror/conf/SiteDefs.pm
 
 	echo "Configuring Apache."
+echo @heelo
 	db_get ensembl/port
+echo @heelo
 	ensemblPort="$RET"
 
 	echo "Configuring Ensembl web user database."
@@ -121,8 +123,10 @@
 if [ -x "/etc/init.d/ensembl" ]; then
 	update-rc.d ensembl defaults >/dev/null
 	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d apache2 stop || exit $?
 		invoke-rc.d ensembl start || exit $?
 	else
+		/etc/init.d/apache2 stop || exit $?
 		/etc/init.d/ensembl start || exit $?
 	fi
 fi

Deleted: trunk/packages/ensembl/ensembl/57/debian/ensembl.templates
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.templates	2011-01-29 20:18:25 UTC (rev 5762)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.templates	2011-01-29 20:30:25 UTC (rev 5763)
@@ -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.

Copied: trunk/packages/ensembl/ensembl/57/debian/templates (from rev 5757, trunk/packages/ensembl/ensembl/57/debian/ensembl.templates)
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/templates	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/57/debian/templates	2011-01-29 20:30:25 UTC (rev 5763)
@@ -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.