[kune-commits] r1790 - trunk/debian

[Vicente J. Ruiz Jurado]

Author: vjrj_
Date: 2012-03-26 02:47:40 +0200 (Mon, 26 Mar 2012)
New Revision: 1790

Modified:
   trunk/debian/README.Debian
   trunk/debian/kune.dirs
   trunk/debian/kune.init
   trunk/debian/kune.preinst
   trunk/debian/rules
Log:
debian package

Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2012-03-25 23:00:44 UTC (rev 1789)
+++ trunk/debian/README.Debian	2012-03-26 00:47:40 UTC (rev 1790)
@@ -6,5 +6,7 @@
 *       hard    nofile          20000
 to prevent "Too many files open" error.
 
+If you install openfire, configure /etc/kune/kune.properties accordingly. 
+
  -- Vicente J. Ruiz Jurado <vjrj at ourproject.org>  Sun, 25 Mar 2012 20:35:20 +0200
 

Modified: trunk/debian/kune.dirs
===================================================================
--- trunk/debian/kune.dirs	2012-03-25 23:00:44 UTC (rev 1789)
+++ trunk/debian/kune.dirs	2012-03-26 00:47:40 UTC (rev 1790)
@@ -1,9 +1,10 @@
 /etc/kune/
 /usr/share/kune/
-/usr/share/kune/ws/
 /usr/share/kune/bin/
 /usr/share/kune/lib/
 /usr/share/kune/custom/
 /usr/share/kune/webapp/
+/usr/share/kune/webclient/
+/usr/share/kune/webclient/ws/
 /var/lib/kune/uploads/
 /var/lib/kune/lucene/kune_prod/indexes/

Modified: trunk/debian/kune.init
===================================================================
--- trunk/debian/kune.init	2012-03-25 23:00:44 UTC (rev 1789)
+++ trunk/debian/kune.init	2012-03-26 00:47:40 UTC (rev 1790)
@@ -13,7 +13,8 @@
 DESC="kune server"
 NAME=kune             
 DAEMON=/usr/share/kune/bin/server.sh
-DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a"             # Arguments to run the daemon with
+# Arguments to run the daemon with (see server.sh -h)
+DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -54,9 +55,12 @@
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
+	echo "." >&2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
+        else
+           echo "Skiping start (see /etc/default/kune)" >&2
         fi
 }
 
@@ -72,6 +76,7 @@
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
 	RETVAL="$?"
+	echo "." >&2
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
@@ -83,6 +88,7 @@
 	[ "$?" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
 	rm -f $PIDFILE
+	echo "." >&2
 	return "$RETVAL"
 }
 

Modified: trunk/debian/kune.preinst
===================================================================
--- trunk/debian/kune.preinst	2012-03-25 23:00:44 UTC (rev 1789)
+++ trunk/debian/kune.preinst	2012-03-26 00:47:40 UTC (rev 1790)
@@ -28,7 +28,7 @@
 
     mkdir -p /etc/kune
     mkdir -p /usr/share/kune/bin
-    mkdir -p /usr/share/kune/ws
+    mkdir -p /usr/share/kune/webclient/ws
     mkdir -p /usr/share/kune/lib
     mkdir -p /usr/share/kune/webapp
     mkdir -p /usr/share/kune/custom
@@ -38,7 +38,8 @@
     chown kune:kune /etc/kune
     chown kune:kune /usr/share/kune
     chown kune:kune /usr/share/kune/bin
-    chown kune:kune /usr/share/kune/ws
+    chown kune:kune /usr/share/kune/webclient
+    chown kune:kune /usr/share/kune/webclient/ws
     chown kune:kune /usr/share/kune/lib
     chown kune:kune /usr/share/kune/webapp
     chown kune:kune /usr/share/kune/custom
@@ -47,7 +48,8 @@
 
     chmod 0755 /etc/kune
     chown 0755 /usr/share/kune
-    chown 0755 /usr/share/kune/ws
+    chown 0755 /usr/share/kune/webclient
+    chown 0755 /usr/share/kune/webclient/ws
     chown 0755 /usr/share/kune/bin
     chown 0755 /usr/share/kune/lib
     chown 0755 /usr/share/kune/webapp

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2012-03-25 23:00:44 UTC (rev 1789)
+++ trunk/debian/rules	2012-03-26 00:47:40 UTC (rev 1790)
@@ -44,15 +44,20 @@
 
 install/kune::
 
+# FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles
+# FIXME user owner and perms of this
 	cp $(CURDIR)/script/server.sh $(KUNE)/bin/
 	cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar
-	cp $(RESOURCES)/kune.properties $(ETCDIR)
+	cp $(RESOURCES)/kune-production.properties $(ETCDIR)
 	cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties
 	cp $(RESOURCES)/server.federation.config.example $(ETCDIR)
 	cp $(RESOURCES)/jaas.config $(ETCDIR)
 	cp $(RESOURCES)/mail-notif-template.html $(ETCDIR)
+
+# FIXME find another better way to do this (and remove rsync build dep)
+# FIXME user owner and perms of this
 	rsync -aC $(CURDIR)/src/main/webapp/* $(KUNE)/webapp
-	rsync -aC $(TARGETC)/ws/* $(KUNE)/ws
+	rsync -aC $(TARGETC)/ws/* $(KUNE)/webclient/ws
 
 #get-orig-source:
 #        sh -e debian/orig-tar.sh