- Add additional instruction lines about jitis-videobridge configuration into

  pkg-message file
- Few rc script modifications
- Bump PORTREVISION

3 files changed, 25 insertions, 13 deletions

diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
index d7e3042434d9..5af587a64f1c 100644
--- a/net-im/jitsi-videobridge/Makefile
+++ b/net-im/jitsi-videobridge/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jitsi
 DISTVERSION=	2.1-183
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im java
 PKGNAMESUFFIX=	-videobridge
 
@@ -24,6 +24,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES+=	pkg-message
+SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/videobridge
 
 DEV_UPDATE_MODE=        no
diff --git a/net-im/jitsi-videobridge/files/jitsi-videobridge.in b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
index da5466f3504c..4d6a8c4289dc 100644
--- a/net-im/jitsi-videobridge/files/jitsi-videobridge.in
+++ b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
@@ -8,6 +8,8 @@
 #
 # Configuration settings for jitsi-videobridge in /etc/rc.conf:
 #
+# jitsi_videobridge_enable:	run jitsi_videobridge server (default=NO)
+# jitsi_videobridge_flags:	additional flags for jitsi_videobridge server (default="")
 #
 
 . /etc/rc.subr
@@ -15,7 +17,7 @@
 name="jitsi_videobridge"
 rcvar=${name}_enable
 
-jitsi_videobridge_env_file="%%LOCALBASE%%/etc/jitsi/videobridge/jitsi-videobridge.conf"
+jitsi_videobridge_env_file="%%ETCDIR%%/jitsi-videobridge.conf"
 jitsi_videobridge_jar="%%JAVAJARDIR%%/jitsi-videobridge.jar"
 jitsi_videobridge_logging_config="%%DATADIR%%/lib/logging.properties"
 
@@ -24,7 +26,7 @@ load_rc_config "${name}"
 : ${jitsi_videobridge_enable="NO"}
 : ${jitsi_videobridge_flags=""}
 
-command="%%LOCALBASE%%/bin/java"
+command="%%JAVA%%"
 
 pidfile="/var/run/jitsi-videobridge.pid"
 required_files="${jitsi_videobridge_env_file}"
@@ -35,8 +37,10 @@ restart_cmd=${name}_restart
 
 jitsi_videobridge_start()
 {
-	daemon -p ${pidfile} -o /var/log/jitsi-videobridge.log ${command} -Xmx${VIDEOBRIDGE_MAX_MEMORY} \
-                -XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError \
+	daemon -p ${pidfile} -o /var/log/jitsi-videobridge.log \
+		${command} -Xmx${VIDEOBRIDGE_MAX_MEMORY} \
+                -XX:+UseConcMarkSweepGC \
+                -XX:+HeapDumpOnOutOfMemoryError \
                 -XX:HeapDumpPath=/tmp \
                 -Djava.util.logging.config.file=${jitsi_videobridge_logging_config} \
                 -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
@@ -48,7 +52,7 @@ jitsi_videobridge_start()
                 --domain=${JVB_XMPP_DOMAIN} \
                 --port=${JVB_XMPP_PORT} \
                 --secret=${JVB_XMPP_SECRET} ${jitsi_videobridge_flags}
-		echo "Started"
+                echo "Started"
 }
 
 jitsi_videobridge_stop()
diff --git a/net-im/jitsi-videobridge/files/pkg-message.in b/net-im/jitsi-videobridge/files/pkg-message.in
index 4999bc5361a1..f73fd9c4f82d 100644
--- a/net-im/jitsi-videobridge/files/pkg-message.in
+++ b/net-im/jitsi-videobridge/files/pkg-message.in
@@ -3,12 +3,10 @@
   message: <<EOM
 Jitsi Video Bridge was installed
 
-1) Jitsi VideoBridge global configuration file is located at:
+1) The configuration file is used by the startup rcfile and located at:
    
    %%ETCDIR%%/jitsi-videobridge.conf
 
-   Values defined there are used by startup script file
-
 2) Add jitsi_videobridge_enable="YES" to /etc/rc.conf.
 
 3) Additional jitsi-videobridge properties to control the TCP-related 
@@ -18,19 +16,28 @@ Jitsi Video Bridge was installed
 
    This file not exists by default
 
-4) More about jitsi-videobridge properties at:
+4) If jitsi-videobridge server is running behind NAT, you must add the 
+   following lines to sip-comunnicator.properties file
+
+   org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=Local_IP_Address
+   org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=Public_IP_Address
+
+   Also, you must redirect TCP/4443 and UDP/10000 ports to jitsi-videobridge 
+   server
+
+5) More about jitsi-videobridge properties at:
 
    https://github.com/jitsi/jitsi-videobridge/blob/master/doc/tcp.md
 
-5) If you want use jitsi-videobridge on FreeBSD 11.x, please look for apply the
+6) If you want use jitsi-videobridge on FreeBSD 11.x, please apply the
    following patch file:
 
    https://reviews.freebsd.org/D14453
 
-   jitsi-videobridge rc script use ${name}_env_file funcitonality. It is 
+   jitsi-videobridge rc script use ${name}_env_file funcitonality, which is only
    available on FreeBSD >= 12.x
 
-6) Enjoy it
+7) Enjoy it
 EOM
 }
 ]