[kune-commits] r1860 - in trunk: debian src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/manager/file src/main/resources src/main/webapp
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Thu Apr 26 03:26:05 CEST 2012
Author: vjrj_
Date: 2012-04-26 03:26:03 +0200 (Thu, 26 Apr 2012)
New Revision: 1860
Modified:
trunk/debian/changelog
trunk/debian/files
trunk/debian/kune.init
trunk/debian/kune.postinst
trunk/src/main/java/cc/kune/core/server/KuneRackModule.java
trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java
trunk/src/main/resources/kune-production.properties
trunk/src/main/webapp/ws.html
Log:
deb package fixs, thks to jhonny5
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/debian/changelog 2012-04-26 01:26:03 UTC (rev 1860)
@@ -1,6 +1,12 @@
+kune (0.2.0+b3) unstable; urgency=low
+
+ * Init loging fixed. Other minor changes
+
+ -- Vicente J. Ruiz Jurado <vjrj at ourproject.org> Wed, 25 Apr 2012 20:02:45 +0200
+
kune (0.2.0+b2) unstable; urgency=low
- * Debian init script and server script logging via wrapper.
+ * Debian init script and server script loging via wrapper.
-- Vicente J. Ruiz Jurado <vjrj at ourproject.org> Wed, 18 Apr 2012 22:49:55 +0200
Modified: trunk/debian/files
===================================================================
--- trunk/debian/files 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/debian/files 2012-04-26 01:26:03 UTC (rev 1860)
@@ -1 +1 @@
-kune_0.2.0+b2_all.deb java optional
+kune_0.2.0+b3_all.deb java optional
Modified: trunk/debian/kune.init
===================================================================
--- trunk/debian/kune.init 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/debian/kune.init 2012-04-26 01:26:03 UTC (rev 1860)
@@ -10,8 +10,8 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="kune server"
-NAME=kune
+DESC="collaborative social network"
+NAME="kune"
USER=kune
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
@@ -50,11 +50,12 @@
if is_true "$START" ; then
# FIXME This should go in limits.conf
ulimit -n 65000
- log_daemon_msg "Starting" "$NAME"
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
+ touch $LOGFILE
+ chown $USER:$USER $LOGFILE
start-stop-daemon --start -b -m --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $USER:$USER --exec $DAEMON --test > /dev/null \
|| return 1
# http://serverfault.com/questions/162602/stdout-stderr-redirects-in-start-stop-daemon
@@ -66,6 +67,7 @@
# on this one. As a last resort, sleep for some time.
else
log_daemon_msg "Skipping start of kune (see /etc/default/kune)" ""
+ return 0
fi
}
@@ -79,7 +81,6 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- log_daemon_msg "Stopping" "$NAME"
start-stop-daemon --stop --quiet --retry=TERM/15/KILL/5 --pidfile $PIDFILE --name $NAME >> $LOGFILE 2>> $LOGFILE
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
@@ -105,7 +106,7 @@
# restarting (for example, when it is sent a SIGHUP),
# then implement that here.
#
- log_daemon_msg "Reloading" "$NAME"
+ log_daemon_msg "Reloading $DESC" "$NAME"
# Seems that dont works if the user/group is not the same:
# http://stackoverflow.com/questions/4147288/how-to-trap-a-signal-in-a-java-application-initialized-using-a-bash-script
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --user $USER --group $USER --name $NAME >> $LOGFILE 2>> $LOGFILE
@@ -114,19 +115,19 @@
case "$1" in
start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
esac
;;
stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
esac
;;
status)
Modified: trunk/debian/kune.postinst
===================================================================
--- trunk/debian/kune.postinst 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/debian/kune.postinst 2012-04-26 01:26:03 UTC (rev 1860)
@@ -36,8 +36,7 @@
chown -R kune:kune /etc/kune
chown -R kune:kune /usr/share/kune
chown -R kune:kune /var/log/kune/
- chown -R kune:kune /var/lib/kune/uploads
- chown -R kune:kune /var/lib/kune/lucene/
+ chown -R kune:kune /var/lib/kune
chmod -R 0755 /etc/kune
chmod -R 0755 /usr/share/kune
Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-04-26 01:26:03 UTC (rev 1860)
@@ -50,7 +50,6 @@
import cc.kune.core.server.rack.RackModule;
import cc.kune.core.server.rack.filters.ForwardFilter;
import cc.kune.core.server.rack.filters.ListenerFilter;
-import cc.kune.core.server.rack.filters.LogFilter;
import cc.kune.core.server.rack.filters.RedirectFilter;
import cc.kune.core.server.rack.filters.rest.RESTServicesModule;
import cc.kune.core.server.rest.ContentJSONService;
@@ -146,7 +145,7 @@
builder.exclude("/static/.*");
builder.exclude("/webclient/.*");
- builder.at(".*").install(new LogFilter());
+ // builder.at(".*").install(new LogFilter());
builder.at(".*").install(new GuiceFilter());
// NOTE: Commented this while testing Wave
Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2012-04-26 01:26:03 UTC (rev 1860)
@@ -33,8 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.waveprotocol.box.server.CoreSettings;
import cc.kune.core.server.manager.GroupManager;
@@ -47,8 +45,6 @@
public class EntityLogoDownloadManager extends HttpServlet {
- public static final Log LOG = LogFactory.getLog(EntityLogoDownloadManager.class);
-
private static final long serialVersionUID = -1958945058088446881L;
private final byte[] groupLogo;
GroupManager groupManager;
Modified: trunk/src/main/resources/kune-production.properties
===================================================================
--- trunk/src/main/resources/kune-production.properties 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/src/main/resources/kune-production.properties 2012-04-26 01:26:03 UTC (rev 1860)
@@ -3,7 +3,7 @@
### general site config
# Your site url. Please end with a slash
-kune.siteurl = http://localhost:8080/
+kune.siteurl = http://localhost:8888/
kune.sitelogourl = ws/images/kune-logo-16px.png
kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2012-04-23 18:56:08 UTC (rev 1859)
+++ trunk/src/main/webapp/ws.html 2012-04-26 01:26:03 UTC (rev 1860)
@@ -329,8 +329,7 @@
<!-- Remember user/pass (this part is used to send the values to the browser) -->
<form id="login" action="javascript:;" style="display: none;">
<input type="text" id="username" name="username" value="" /> <input
- type="password" id="password" name="password" value="" /> <input
- id="loginsubmit" type="submit" value="login">
+ type="password" id="password" name="password" value="" />
</form>
<!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
<noscript>
More information about the kune-commits
mailing list