[pkg-java] r11173 - trunk/red5/debian

Sun Nov 29 17:26:10 UTC 2009

Author: drazzib
Date: 2009-11-29 17:26:10 +0000 (Sun, 29 Nov 2009)
New Revision: 11173

Removed:
   trunk/red5/debian/TODO
Modified:
   trunk/red5/debian/README.Debian
   trunk/red5/debian/control
   trunk/red5/debian/red5-server.default
   trunk/red5/debian/red5-server.init
Log:
Cleanup before final upload

Modified: trunk/red5/debian/README.Debian
===================================================================

--- trunk/red5/debian/README.Debian	2009-11-29 17:23:18 UTC (rev 11172)
+++ trunk/red5/debian/README.Debian	2009-11-29 17:26:10 UTC (rev 11173)
@@ -10,10 +10,11 @@
 
 Directories
 -----------
-This debian package installs red5 into /usr/share/red5
-The configuration of the server is in /etc/red5
-Webapps can be deployed by placing them in /var/lib/red5/webapps
+This debian package installs red5 into /usr/share/red5/
+The configuration of the server is in /etc/red5/
+Webapps can be deployed by placing them in /var/lib/red5/webapps/
 (linked from /usr/share/red5/webapps)
+Logs can be found in /var/log/red5/
 
 Documentation
 -------------
@@ -22,5 +23,15 @@
 
 Startup
 -------
-You can edit Red5 startup parameters by customizing /etc/default/red5-server file.
+You can customize Red5 startup parameters by editing /etc/default/red5-server file.
 For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs.
+
+Ports
+-----
+By default, Red5 open the following ports :
+- 5080 (HTTP port - embedded Tomcat)
+- 1935 (RTMP port)
+- 8443 (RTMPS port)
+- 9980 (JMX port - admin and shutdown)
+
+You can edit port mapping in /etc/red5/red5.properties

Deleted: trunk/red5/debian/TODO
===================================================================
--- trunk/red5/debian/TODO	2009-11-29 17:23:18 UTC (rev 11172)
+++ trunk/red5/debian/TODO	2009-11-29 17:26:10 UTC (rev 11173)
@@ -1,3 +0,0 @@
-- Add conffiles for everything in /etc ?
-- Create some wrapper script to enable / disable some context
-- Cleanup keystore and default passwords

Modified: trunk/red5/debian/control
===================================================================
--- trunk/red5/debian/control	2009-11-29 17:23:18 UTC (rev 11172)
+++ trunk/red5/debian/control	2009-11-29 17:26:10 UTC (rev 11173)
@@ -16,8 +16,8 @@
  libbackport-util-concurrent-java,
  openjdk-6-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
 Standards-Version: 3.8.3
-Vcs-Svn: http://svn.drazzib.com/debian-pkg/red5/trunk/
-Vcs-Browser: http://svn.drazzib.com/wsvn/debian-pkg/red5/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
 Homepage: http://www.red5.org/
 
 Package: libred5-java

Modified: trunk/red5/debian/red5-server.default
===================================================================
--- trunk/red5/debian/red5-server.default	2009-11-29 17:23:18 UTC (rev 11172)
+++ trunk/red5/debian/red5-server.default	2009-11-29 17:26:10 UTC (rev 11173)
@@ -1,4 +1,24 @@
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
-JAVA_OPTS=
-RED5_HOME=/usr/share/red5/
-RED5_OPTS=
+# Whether to start Red5 (as a daemon or not)
+#NO_START=0
+
+# Time to wait for the server to die, in seconds
+#DIETIME=30
+
+# Time to wait for the server to start, in seconds
+#STARTTIME=5
+
+# Users to run the daemons as. If this value
+# is set start-stop-daemon will chuid the server
+#DAEMONUSER=_red5
+
+# JVM to use to start Red5
+#JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+
+# JVM options for startup
+#JAVA_OPTS=
+
+# Home of Red5 server
+#RED5_HOME=/usr/share/red5/
+
+# Options for Red5 server
+#RED5_OPTS=

Modified: trunk/red5/debian/red5-server.init
===================================================================
--- trunk/red5/debian/red5-server.init	2009-11-29 17:23:18 UTC (rev 11172)
+++ trunk/red5/debian/red5-server.init	2009-11-29 17:26:10 UTC (rev 11173)
@@ -29,29 +29,34 @@
 # Description:       Flash streaming server
 ### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/share/red5/red5.sh
-DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
-RED5_MAINCLASS=org.red5.server.Bootstrap
-NAME=red5-server
-DESC="Flash streaming server"
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
 . /lib/lsb/init-functions
 
 # Default options, these can be overriden by the information
 # at /etc/default/red5
 
-DIETIME=30        # Time to wait for the server to die, in seconds
-STARTTIME=5       # Time to wait for the server to start, in seconds
-DAEMONUSER=_red5   # Users to run the daemons as. If this value
-                   # is set start-stop-daemon will chuid the server
+# Whether to start Red5 (as a daemon or not)
+NO_START=0
+
+# Time to wait for the server to die, in seconds
+DIETIME=30
+
+# Time to wait for the server to start, in seconds
+STARTTIME=5
+
+# Users to run the daemons as. If this value
+# is set start-stop-daemon will chuid the server
+DAEMONUSER=_red5
+
+# JVM to use to start Red5
 JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+
+# JVM options for startup
 JAVA_OPTS=
+
+# Home of Red5 server
 RED5_HOME=/usr/share/red5/
+
+# Options for Red5 server
 RED5_OPTS=
 
 # End of variables that can be overwritten
@@ -61,6 +66,18 @@
     . /etc/default/$NAME
 fi
 
+#Others configuration options not overrideable
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/share/red5/red5.sh
+DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
+RED5_MAINCLASS=org.red5.server.Bootstrap
+NAME=red5-server
+DESC="Flash streaming server"
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+
 # Check that the user exists (if we set a user)
 # Does the user exist?
 if [ -n "$DAEMONUSER" ] ; then
@@ -74,6 +91,11 @@
     fi
 fi
 
+# Check whether startup has been disabled
+if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
+        [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting $NAME - edit /etc/default/$NAME and change NO_START to be 0 (or comment it out)."
+        exit 0
+fi
 
 set -e
 


