JVB2 changes, unification

8 files changed, 87 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37cfca0850b5..1d99f9ee025c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jitsi-videobridge-git
 	pkgdesc = Videobridge for Jitsi Meet
-	pkgver = r3045.fdd68a74
-	pkgrel = 2
+	pkgver = r3058.5f9377b9
+	pkgrel = 1
 	url = https://github.com/jitsi/jitsi-videobridge
 	arch = x86_64
 	license = Apache
@@ -10,13 +10,16 @@ pkgbase = jitsi-videobridge-git
 	depends = jdk8-openjdk
 	provides = jitsi-videobridge
 	conflicts = jitsi-videobridge
-	backup = etc/jitsi-videobridge/jitsi-videobridge.conf
+	backup = etc/jitsi/videobridge/jitsi-videobridge.conf
+	backup = etc/jitsi/videobridge/sip-communicator.properties
 	source = jitsi-videobridge::git+https://github.com/jitsi/jitsi-videobridge.git
-	source = service
-	source = config
+	source = jitsi-videobridge.conf
+	source = jitsi-videobridge.service
+	source = sip-communicator.properties
 	sha256sums = SKIP
-	sha256sums = e2c923b8183d08223df47236581bdd5cae4a96df2eab8826ec661ad7ceb35944
-	sha256sums = 5b185655f1ddfd6003001de47bc7715686182c3991d5e33e8ebd8053559cd5ca
+	sha256sums = d2746be91f361557343398b9544233f1482d60c6117db4ecaa7c7851cd347b50
+	sha256sums = 4d68d857e76e38c9379573143a60eab681b721543f8515edad95530f95d4384a
+	sha256sums = 2b7679218752c0435a1496306b447d72aafaf5b671b6eef63e58c83a67638ced
 
 pkgname = jitsi-videobridge-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..bfb234979660
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*
+!.SRCINFO
+!PKGBUILD
+!.gitignore
+!jitsi-videobridge.service
+!jitsi-videobridge.conf
+!sip-communicator.properties
diff --git a/PKGBUILD b/PKGBUILD
index bb1788690635..5b07bab529a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=jitsi-videobridge-git
-pkgver=r3045.fdd68a74
-pkgrel=2
+pkgver=r3059.83195fcd
+pkgrel=1
 pkgdesc="Videobridge for Jitsi Meet"
 arch=("x86_64")
 url="https://github.com/jitsi/jitsi-videobridge"
@@ -9,13 +9,16 @@ depends=("jdk8-openjdk")
 makedepends=("unzip" "maven")
 provides=(jitsi-videobridge)
 conflicts=(jitsi-videobridge)
-backup=("etc/jitsi-videobridge/jitsi-videobridge.conf")
+backup=("etc/jitsi/videobridge/jitsi-videobridge.conf"
+        "etc/jitsi/videobridge/sip-communicator.properties")
 source=("jitsi-videobridge::git+https://github.com/jitsi/jitsi-videobridge.git"
-        service
-        config)
+        jitsi-videobridge.conf
+        jitsi-videobridge.service
+        sip-communicator.properties)
 sha256sums=("SKIP"
-            "e2c923b8183d08223df47236581bdd5cae4a96df2eab8826ec661ad7ceb35944"
-            "5b185655f1ddfd6003001de47bc7715686182c3991d5e33e8ebd8053559cd5ca")
+            "d2746be91f361557343398b9544233f1482d60c6117db4ecaa7c7851cd347b50"
+            "4d68d857e76e38c9379573143a60eab681b721543f8515edad95530f95d4384a"
+            "2b7679218752c0435a1496306b447d72aafaf5b671b6eef63e58c83a67638ced")
 
 pkgver() {
     cd "jitsi-videobridge"
@@ -26,13 +29,12 @@ build() {
     cd "jitsi-videobridge"
     mvn package -DskipTests -Dassembly.skipAssembly=false
     unzip -o target/jitsi-videobridge-2.1-SNAPSHOT-archive.zip
-
-
 }
 
 package() {
     install -d "${pkgdir}/opt"
     cp -R "${srcdir}/jitsi-videobridge/jitsi-videobridge-2.1-SNAPSHOT/" "${pkgdir}/opt/jitsi-videobridge"
-    install -Dm644 service "$pkgdir"/usr/lib/systemd/system/jitsi-videobridge.service
-    install -Dm644 config "$pkgdir"/etc/jitsi-videobridge/jitsi-videobridge.conf
+    install -Dm644 jitsi-videobridge.service "$pkgdir"/usr/lib/systemd/system/jitsi-videobridge.service
+    install -Dm644 jitsi-videobridge.conf "$pkgdir"/etc/jitsi/videobridge/jitsi-videobridge.conf
+    install -Dm644 sip-communicator.properties "${pkgdir}"/etc/jitsi/videobridge/sip-communicator.properties
 }
diff --git a/config b/config
deleted file mode 100644
index 26289974fbe4..000000000000
--- a/config
+++ /dev/null
@@ -1 +0,0 @@
-flags="--host=localhost --domain=jitsi.example.com --port=5347 --secret=YOURSECRET1"
diff --git a/jitsi-videobridge.conf b/jitsi-videobridge.conf
new file mode 100644
index 000000000000..8461807bb2f8
--- /dev/null
+++ b/jitsi-videobridge.conf
@@ -0,0 +1,25 @@
+# sets the XMPP domain (default: none)
+JVB_HOSTNAME=jitsi.example.com
+
+# sets the hostname of the XMPP server (default: domain if set, localhost otherwise)
+JVB_HOST=localhost
+
+# sets the port of the XMPP server (default: 5275)
+JVB_PORT=5347
+
+# sets the shared secret used to authenticate to the XMPP server
+JVB_SECRET=
+
+# extra options to pass to the JVB daemon
+# --apis defaults to xmpp, which breaks the current jvb2 as of 2020-05-02
+JVB_OPTS="--apis=,"
+
+# adds java system props that are passed to jvb (default are for home and logging config file)
+JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi\
+ -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge\
+ -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi-videobridge\
+ -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties"
+
+# application config (not ready yet)
+# https://github.com/jitsi/jitsi-videobridge/issues/1229
+#JAVA_SYS_PROPS="-Dconfig.file=/etc/jitsi-videobridge/application.conf -Djava.util.logging.config.file=/etc/jitsi-videobridge/logging.properties"
diff --git a/jitsi-videobridge.service b/jitsi-videobridge.service
new file mode 100644
index 000000000000..d54360414703
--- /dev/null
+++ b/jitsi-videobridge.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Jitsi Videobridge
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/jitsi/videobridge/jitsi-videobridge.conf
+ExecStart=/opt/jitsi-videobridge/jvb.sh --host=${JVB_HOST} --domain=${JVB_HOSTNAME} --port=${JVB_PORT} --secret=${JVB_SECRET} ${JVB_OPTS}
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service b/service
deleted file mode 100644
index 6fa7352b697e..000000000000
--- a/service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Jitsi Videobridge
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/jitsi-videobridge/jitsi-videobridge.conf
-ExecStart=/opt/jitsi-videobridge/jvb.sh ${flags}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sip-communicator.properties b/sip-communicator.properties
new file mode 100644
index 000000000000..cf9c5ead7c05
--- /dev/null
+++ b/sip-communicator.properties
@@ -0,0 +1,19 @@
+org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
+#org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=meet-jit-si-turnrelay.jitsi.net:443
+
+# Enable broadcasting stats/presence in a MUC
+#org.jitsi.videobridge.ENABLE_STATISTICS=true
+#org.jitsi.videobridge.STATISTICS_TRANSPORT=muc
+
+# Uncomment and configure to enable XMPP client
+#org.jitsi.videobridge.xmpp.user.shard.HOSTNAME=localhost
+#org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.jitsi.example.com
+#org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb
+#org.jitsi.videobridge.xmpp.user.shard.PASSWORD=JVB_SECRET
+#org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.jitsi.example.com
+#org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=SOME_RANDOM_UUID
+##org.jitsi.videobridge.xmpp.user.shard.DISABLE_CERTIFICATE_VERIFICATION=true
+
+# If you're behind a nat, define local and public IPv4
+#org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=LOCAL_IPV4_GOES_HERE
+#org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=PUBLIC_IPV4_GOES_HERE