Author: vjrj_ Date: 2012-03-27 02:41:57 +0200 (Tue, 27 Mar 2012) New Revision: 1799 Modified: trunk/DEV-GUIDE trunk/INSTALL trunk/debian/README.Debian trunk/debian/config trunk/debian/kune.init trunk/script/server.sh trunk/src/main/java/cc/kune/events/server/EventsServlet.java trunk/src/main/resources/assembly.xml Log: CLOSED - # 119: Generate debian packages for production installs http://kune.ourproject.org/issues/ticket/119 Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/DEV-GUIDE 2012-03-27 00:41:57 UTC (rev 1799) @@ -351,7 +351,7 @@ See class WaveClientProvider in Kune (in a short term, we should define this in a .gwt.xml not there, but this is a start point). -== kune maven repo == +==kune maven repo== For upload packages you need to configure in .m2/settings.xml something like: Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/INSTALL 2012-03-27 00:41:57 UTC (rev 1799) @@ -185,7 +185,9 @@ ==Debian package generation== In trunk run: -debuild -us -uc -b + mvn assembly:assembly +and generate the debian package with + debuild -us -uc -b ===Customization: Adapting Kune to your site=== Modified: trunk/debian/README.Debian =================================================================== --- trunk/debian/README.Debian 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/debian/README.Debian 2012-03-27 00:41:57 UTC (rev 1799) @@ -1,9 +1,14 @@ kune for Debian --------------- -If you install openfire, configure /etc/kune/kune.properties accordingly. -Also you should install a MTA (exim4 or postfix) and configure kune.properties in the same way +See /etc/kune for the default configuration and tune there your installation. +Also check START variable in /etc/default/kune + +If you install openfire (recommended), configure /etc/kune/kune.properties accordingly. + +Also you should install a MTA (exim4 or postfix) and configure kune.properties in the same way if you want to send notifications to your users (email confirmations, etc). + Add to /etc/security/limits.conf: * soft nofile 20000 * hard nofile 20000 Modified: trunk/debian/config =================================================================== --- trunk/debian/config 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/debian/config 2012-03-27 00:41:57 UTC (rev 1799) @@ -10,7 +10,7 @@ if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then . /usr/share/dbconfig-common/dpkg/config.mysql - dbc_dbuser=kune + dbc_dbuser=kune_prod dbc_dbname=kune_prod dbc_mysql_createdb_encoding="UTF8" dbc_go kune $@ Modified: trunk/debian/kune.init =================================================================== --- trunk/debian/kune.init 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/debian/kune.init 2012-03-27 00:41:57 UTC (rev 1799) @@ -46,6 +46,7 @@ do_start() { if is_true "$START" ; then + log_daemon_msg "Starting kune" # Return # 0 if daemon has been started # 1 if daemon was already running @@ -59,7 +60,7 @@ # 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 + log_daemon_msg "Skipping start of kune (see /etc/default/kune)" fi } @@ -73,6 +74,7 @@ # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred + log_daemon_msg "Stopping kune" start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 @@ -98,6 +100,7 @@ # restarting (for example, when it is sent a SIGHUP), # then implement that here. # + log_daemon_msg "Reloading kune" start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME return 0 } Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/script/server.sh 2012-03-27 00:41:57 UTC (rev 1799) @@ -139,7 +139,7 @@ -Dwave.server.config=$WAVE_CONFIG \ $MS \ $MX \ - -jar $JAR </dev/null > $LOGFILE 2>&1 & + -jar $JAR </dev/null >> $LOGFILE 2>&1 & echo $! > $PIDFILE else exec java $DEBUG_FLAGS \ Modified: trunk/src/main/java/cc/kune/events/server/EventsServlet.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-27 00:41:57 UTC (rev 1799) @@ -68,7 +68,7 @@ try { final Container cnt = getContainer(userHash, token); - if (cnt.getTypeId().equals(EventsToolConstants.TYPE_ROOT)) { + if (cnt != null && cnt.getTypeId().equals(EventsToolConstants.TYPE_ROOT)) { final List<Map<String, String>> listOfProps = EventsServerConversionUtil.getAppointments(cnt); for (final Map<String, String> props : listOfProps) { try { Modified: trunk/src/main/resources/assembly.xml =================================================================== --- trunk/src/main/resources/assembly.xml 2012-03-27 00:16:22 UTC (rev 1798) +++ trunk/src/main/resources/assembly.xml 2012-03-27 00:41:57 UTC (rev 1799) @@ -17,14 +17,13 @@ </dependencySets> <fileSets> <!-- <fileSet> --> - <!-- ${module.groupId}-${module.artifactId}-${module.version}.${module.extension} --> - <!-- <directory>target/kune-0.1.0-SNAPSHOT/ws/</directory> - <outputDirectory>META-INF/resources/ws</outputDirectory> - </fileSet>--> - <fileSet> - <directory>${project.basedir}/src/main/webapp/</directory> - <outputDirectory>META-INF/resources/webapp</outputDirectory> - <filtered>true</filtered> - </fileSet> + <!-- ${module.groupId}-${module.artifactId}-${module.version}.${module.extension} --> + <!-- <directory>target/kune-0.1.0-SNAPSHOT/ws/</directory> <outputDirectory>META-INF/resources/ws</outputDirectory> + </fileSet> --> + <!-- <fileSet> --> + <!-- <directory>${project.basedir}/src/main/webapp/</directory> --> + <!-- <outputDirectory>META-INF/resources/webapp</outputDirectory> --> + <!-- <filtered>true</filtered> --> + <!-- </fileSet> --> </fileSets> </assembly> \ No newline at end of file