improve packaging

janus/janus.spec

@@ -45,8 +45,8 @@ BuildPreReq:  OpenPKG, openpkg >= 20160101, automake, autoconf, libtool, pkgconf
 PreReq:       OpenPKG, openpkg >= 20160101
 BuildPreReq:  glib, jansson, openssl, zlib, libnice, libconfig, libsrtp, gengetopt, libmicrohttpd, libwebsockets
 PreReq:       glib, jansson, openssl, zlib, libnice, libconfig, libsrtp, gengetopt, libmicrohttpd, libwebsockets
-BuildPreReq:  opus, vorbis-libs, curl
-PreReq:       opus, vorbis-libs, curl
+BuildPreReq:  opus, vorbis-libs, curl, paho, usrsctp
+PreReq:       opus, vorbis-libs, curl, paho, usrsctp
 
 %description
     Janus is a general purpose WebRTC server/gateway.
@@ -74,7 +74,7 @@ PreReq:       opus, vorbis-libs, curl
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     LIBS="-lcurl -lssl -lcrypto" \
-    ./configure \
+    %{l_bash} ./configure \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man
 

janus/janus.txt

@@ -4,40 +4,42 @@
 ##
 
 general: {
-	configs_folder    = "/usr/local/etc/janus"
-	plugins_folder    = "/usr/local/lib/janus/plugins"
-	transports_folder = "/usr/local/lib/janus/transports"
-	events_folder     = "/usr/local/lib/janus/events"
-	loggers_folder    = "/usr/local/lib/janus/loggers"
+	configs_folder     = "@l_prefix@/etc/janus"
+	plugins_folder     = "@l_prefix@/lib/janus/plugins"
+	transports_folder  = "@l_prefix@/lib/janus/transports"
+	events_folder      = "@l_prefix@/lib/janus/events"
+	loggers_folder     = "@l_prefix@/lib/janus/loggers"
 
-	log_to_stdout     = true
-	debug_level       = 4
-	daemonize         = false
+	daemonize          = true
+    pid_file           = "@l_prefix@/var/janus/run/janus.pid"
+	log_to_stdout      = false
+    log_to_file        = "@l_prefix@/var/janus/log/janus.log"
+	debug_level        = 4
 
-    api_secret        = "janusrocks"
-    token_auth        = true
-    token_auth_secret = "janus"
-	admin_secret      = "janusoverlord"
+    api_secret         = "janusrocks"
+    token_auth         = true
+    token_auth_secret  = "janus"
+	admin_secret       = "janusoverlord"
 }
 
 nat: {
-    full_trickle      = true
+    full_trickle       = true
 }
 
 media: {
-    rtp_port_range    = "6000-6009"
+    rtp_port_range     = "6000-6009"
 }
 
 plugins: {
-    disable           = "libjanus_voicemail.so,libjanus_recordplay.so,libjanus_streaming.so,libjanus_echotest.so,libjanus_videocall.so,libjanus_sip.so,libjanus_nosip.so"
+    disable            = "libjanus_voicemail.so,libjanus_recordplay.so,libjanus_streaming.so,libjanus_echotest.so,libjanus_videocall.so,libjanus_sip.so,libjanus_nosip.so"
 }
 
 transports: {
-    disable           = "libjanus_rabbitmq.so,libjanus_pfunix.so,libjanus_nanomsg.so"
+    disable            = "libjanus_rabbitmq.so,libjanus_pfunix.so,libjanus_nanomsg.so"
 }
 
 loggers: {
-    disable           = ""
+    disable            = ""
 }
 
 </file>
@@ -47,19 +49,19 @@ loggers: {
 ##
 
 general: {
-    base_path         = "/com-janus"
-    http              = true
-    port              = 8088
-    https             = false
-    secure_port       = 8089
+    base_path          = "/com-janus"
+    http               = true
+    port               = 8088
+    https              = false
+    secure_port        = 8089
 }
 
 admin: {
-    admin_base_path   = "/com-janus/admin"
-    admin_http        = true
-    admin_port        = 7088
-    admin_https       = false
-    admin_secure_port = 7089
+    admin_base_path    = "/com-janus/admin"
+    admin_http         = true
+    admin_port         = 7088
+    admin_https        = false
+    admin_secure_port  = 7089
 }
 
 </file>
@@ -69,17 +71,17 @@ admin: {
 ##
 
 general: {
-    ws                = true
-    ws_port           = 8188
-    wss               = false
-    wss_port          = 8189
+    ws                 = true
+    ws_port            = 8188
+    wss                = false
+    wss_port           = 8189
 }
 
 admin: {
-    admin_ws          = true
-    admin_ws_port     = 7188
-    admin_wss         = false
-    admin_wss_port    = 7189
+    admin_ws           = true
+    admin_ws_port      = 7188
+    admin_wss          = false
+    admin_wss_port     = 7189
 }
 
 </file>
@@ -89,12 +91,12 @@ admin: {
 ##
 
 general: {
-    string_ids        = true
+    string_ids         = true
 }
 
 room-1: {
-    description       = "Demo Text Room"
-    secret            = "demo"
+    description        = "Demo Text Room"
+    secret             = "demo"
 }
 
 </file>
@@ -104,14 +106,14 @@ room-1: {
 ##
 
 general: {
-    string_ids        = true
+    string_ids         = true
 }
 
 room-1: {
-    description       = "Demo Audio Room"
-    secret            = "demo"
-    sampling_rate     = 16000
-    record            = false
+    description        = "Demo Audio Room"
+    secret             = "demo"
+    sampling_rate      = 16000
+    record             = false
 }
 
 </file>
@@ -121,18 +123,55 @@ room-1: {
 ##
 
 general: {
-    string_ids        = true
+    string_ids         = true
 }
 
 room-1: {
-    description       = "Demo Video Room"
-    secret            = "demo"
-    publishers        = 6
-    bitrate           = 128000
-    fir_freq          = 10
-    audiocodec        = "opus,pcmu"
-    videocodec        = "vp9,vp8,h264"
-    record            = false
+    description        = "Demo Video Room"
+    secret             = "demo"
+    publishers         = 6
+    bitrate            = 128000
+    fir_freq           = 10
+    audiocodec         = "opus,pcmu"
+    videocodec         = "vp9,vp8,h264"
+    record             = false
+}
+
+</file>
+<file name="janus.transport.mqtt.jcfg">
+##
+##  janus.transport.mqtt.jcfg -- Janus Gateway Configuration
+##
+
+general: {
+	enabled            = false
+	events             = true
+	url                = "tcp://localhost:1883"
+	mqtt_version       = "5"
+	client_id          = "janus"
+	username           = "janus"					# Username to use to authenticate, if needed
+	password           = "janus"
+	subscribe_topic    = "to-janus"
+	subscribe_qos      = 1
+	publish_topic      = "from-janus"
+	publish_qos        = 1
+}
+
+admin: {
+	admin_enabled      = false
+	subscribe_topic    = "to-janus-admin"
+	subscribe_qos      = 1
+	publish_topic      = "from-janus-admin"
+	publish_qos        = 1
+}
+
+status: {
+	enabled            = false
+	connect_message    = "{ \"online\": true }"
+	disconnect_message = "{ \"online\": false }"
+	topic              = "status"
+	qos                = 1
+	retain             = false
 }
 
 </file>

janus/rc.janus

@@ -12,35 +12,45 @@
     janus_log_minsize="1M"
     janus_log_complevel="9"
 
-%status -u @l_susr@ -o
+%common
+    janus_pidfile="@l_prefix@/var/janus/run/janus.pid"
+    janus_logfile="@l_prefix@/var/janus/log/janus.log"
+    janus_signal () {
+        [ -f $janus_pidfile ] && kill -$1 `cat $janus_pidfile`
+    }
+
+%status -u @l_rusr@ -o
     janus_usable="no"
     janus_active="no"
+    rcService janus enable yes && \
+        janus_signal 0 && janus_active="yes"
     echo "janus_enable=\"$janus_enable\""
     echo "janus_usable=\"$janus_usable\""
     echo "janus_active=\"$janus_active\""
 
-%start -p 100 -u @l_susr@
+%start -p 100 -u @l_rusr@
     rcService janus enable yes || exit 0
     rcService janus active yes && exit 0
     @l_prefix@/bin/janus
 
-%stop -p 900 -u @l_susr@
+%stop -p 900 -u @l_rusr@
     rcService janus enable yes || exit 0
     rcService janus active no  && exit 0
-    @l_prefix@/sbin/rndc stop
+    janus_signal TERM
     sleep 2
+    rm -f $janus_pidfile >/dev/null 2>&1 || true
 
-%restart -p 100 -u @l_susr@
+%restart -p 100 -u @l_rusr@
     rcService janus enable yes || exit 0
     rcService janus active no  && exit 0
     rc janus stop start
 
-%daily -u @l_susr@
+%daily -u @l_rusr@
     rcService janus enable yes || exit 0
     shtool rotate -f \
         -n $janus_log_numfiles -s $janus_log_minsize -d \
         -z $janus_log_complevel -m 644 -o @l_rusr@ -g @l_rgrp@ \
         -P "$janus_log_prolog" \
         -E "$janus_log_epilog" \
-        @l_prefix@/var/janus/janus.log
+        $janus_logfile