update to 2.1+273+g072dd44b

8 files changed, 115 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbdebf43410b..6eb4f223aaf0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,36 @@
 pkgbase = jitsi-videobridge-bin
-	pkgdesc = WebRTC compatible Selective Forwarding Unit (SFU)
-	pkgver = 2.1+202+g5f9377b9
-	pkgrel = 2
-	epoch = 1
-	url = https://jitsi.org/jitsi-videobridge/
+	pkgdesc = Jitsi Meet Videobridge binary
+	pkgver = 2.1+273+g072dd44b
+	pkgrel = 1
+	url = https://jitsi.org/jitsi-meet/
+	install = jitsi.install
 	arch = any
 	license = Apache
 	makedepends = tar
-	depends = java-runtime-headless
+	depends = java-runtime
+	depends = bash
+	optdepends = prosody
 	provides = jitsi-videobridge
 	conflicts = jitsi-videobridge
 	options = !strip
-	backup = etc/jitsi/videobridge/config
-	backup = etc/jitsi/videobridge/sip-communicator.properties
-	backup = etc/jitsi/videobridge/callstats-java-sdk.properties
-	backup = etc/jitsi/videobridge/log4j2.xml
-	backup = etc/jitsi/videobridge/logging.properties
-	source = https://download.jitsi.org/stable/jitsi-videobridge2_2.1-202-g5f9377b9-1_all.deb
-	source = jitsi-videobridge.service
-	source = sysusers.conf
-	source = tmpfiles.conf
+	backup = etc/jitsi-videobridge/config
+	backup = etc/jitsi-videobridge/log4j2.xml
+	backup = etc/jitsi-videobridge/logging.properties
+	backup = etc/jitsi-videobridge/sip-communicator.properties
+	source = https://download.jitsi.org/stable/jitsi-videobridge2_2.1-273-g072dd44b-1_all.deb
 	source = config
 	source = sip-communicator.properties
-	sha256sums = 0afce2a9c591e72a69c28665f8bf48d5e9d3a4e253e6be8737b1913f4d25b29b
-	sha256sums = a23bfd94bcf0a2ffbb9b4939ba09ce80979bd41a7d91ec3d702392e2e648a886
-	sha256sums = 5b47b031d7a1dec536d3fc53e71d971b1052ea2e78e1060b404a792211363515
-	sha256sums = 885923de1718b757826596aaec8e58025ae40ed622bad4b5f43b12ab975c86a2
-	sha256sums = 46f686cd8ea6bb5f1ec6055d2f16cc72db4baf9d90dea234d10e661b50924624
+	source = service
+	source = sysusers.conf
+	source = tmpfiles.conf
+	source = jitsi.install
+	sha256sums = 694f5afd5ecc123ec0e8fe5186adf38f3989fa7a2c9a80c0d316c7622527888a
+	sha256sums = 5c79dc1e1f5ee04eba3da987c488fc53cb6e4348345cab05ab0ed6d7000f3d9d
 	sha256sums = cc9fbf77497bce3c9673b2d144928f11cdd0c0823940c2b60c8369a2f086b9b7
+	sha256sums = f87c5250acba49a62ae55293059281764a6dc8cd99acf23e4b1b8bbee03b4fb1
+	sha256sums = 998cbc64def56ab98080ff7150dd0913a5e10325cd2b038cf3db14baf8cb19fc
+	sha256sums = 4dd8141e71bbf73b39cf242902e1c1a84a38dc3160ff89e76883d999af10541c
+	sha256sums = 59c2b2068205d6972c4b25bf1bbed9aaf08ff395b28309888cfe9b386dc29fa0
 
 pkgname = jitsi-videobridge-bin
 
diff --git a/.gitignore b/.gitignore
index 9ffee5f03a6c..2f3b03ec16c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-pkg/
 src/
+pkg/
+*.pkg.tar.*
 *.deb
-*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 2b77bf34874e..2aa0e7e6f1c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,77 @@
-_pkgname=jitsi-videobridge
-pkgname=${_pkgname}-bin
-epoch=1
-pkgver=2.1+202+g5f9377b9
-pkgrel=2
-_debname=${_pkgname}2
-_debrel=1
-pkgdesc="WebRTC compatible Selective Forwarding Unit (SFU)"
+# Maintainer: C0rn3j <spleefer90@gmail.com>
+# Contributor: Celogeek <private-4zokpdq6@mrhyde.xyz>
+
+_basename=jitsi
+_pkgname=videobridge
+_tag=2.1-273-g072dd44b
+_version=2.1+273+g072dd44b
+
+_pkgbase=${_basename}-${_pkgname}
+_debname=${_basename}-${_pkgname}2
+pkgname=${_pkgbase}-bin
+pkgver=${_version}
+pkgrel=1
+pkgdesc="Jitsi Meet Videobridge binary"
 arch=('any')
-url="https://jitsi.org/jitsi-videobridge/"
+url="https://jitsi.org/jitsi-meet/"
 license=('Apache')
-depends=('java-runtime-headless')
-conflicts=(${_pkgname})
-provides=(${_pkgname})
+depends=("java-runtime" "bash")
+optdepends=("prosody")
 makedepends=('tar')
 options=('!strip')
-backup=('etc/jitsi/videobridge/config'
-        'etc/jitsi/videobridge/sip-communicator.properties'
-        'etc/jitsi/videobridge/callstats-java-sdk.properties'
-        'etc/jitsi/videobridge/log4j2.xml'
-        'etc/jitsi/videobridge/logging.properties')
-
-source=("https://download.jitsi.org/stable/${_debname}_${pkgver//+/-}-${_debrel}_all.deb"
-        "${_pkgname}.service"
-        'sysusers.conf'
-        'tmpfiles.conf'
-        'config'
-        'sip-communicator.properties')
-sha256sums=('0afce2a9c591e72a69c28665f8bf48d5e9d3a4e253e6be8737b1913f4d25b29b'
-            'a23bfd94bcf0a2ffbb9b4939ba09ce80979bd41a7d91ec3d702392e2e648a886'
-            '5b47b031d7a1dec536d3fc53e71d971b1052ea2e78e1060b404a792211363515'
-            '885923de1718b757826596aaec8e58025ae40ed622bad4b5f43b12ab975c86a2'
-            '46f686cd8ea6bb5f1ec6055d2f16cc72db4baf9d90dea234d10e661b50924624'
-            'cc9fbf77497bce3c9673b2d144928f11cdd0c0823940c2b60c8369a2f086b9b7')
+backup=(
+  "etc/${_pkgbase}/config"
+  "etc/${_pkgbase}/log4j2.xml"
+  "etc/${_pkgbase}/logging.properties"
+  "etc/${_pkgbase}/sip-communicator.properties"
+)
+source=(
+        "https://download.jitsi.org/stable/${_debname}_${_tag}-1_all.deb"
+        "config"
+        "sip-communicator.properties"
+        "service"
+        "sysusers.conf"
+        "tmpfiles.conf"
+	"jitsi.install"
+)
+provides=(${_pkgbase})
+conflicts=(${_pkgbase})
+install=jitsi.install
 
-package() {
-  cd "${srcdir}"
-  tar -xJvf data.tar.xz -C "${pkgdir}"
-
-  install -d "${pkgdir}/usr/lib"
-  rm -r "${pkgdir}/etc/init.d"
-  rm -r "${pkgdir}/etc/logrotate.d"
-  mv "${pkgdir}/etc/sysctl.d" "${pkgdir}/usr/lib/sysctl.d"
-  rm -r "${pkgdir}/lib"
-  rm -r "${pkgdir}/usr/share/doc"
-  chmod 0750 "${pkgdir}/etc/jitsi/videobridge"
-
-  sed -i "s@/var/log/jitsi@/var/log/jitsi-videobridge@" "${pkgdir}/etc/jitsi/videobridge/log4j2.xml"
-
-  install -Dm644 "${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
-  install -Dm644 'sysusers.conf' "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
-  install -Dm644 'tmpfiles.conf' "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
-  install -Dm644 'config' "${pkgdir}/etc/jitsi/videobridge/config"
-  install -Dm644 'sip-communicator.properties' "${pkgdir}/etc/jitsi/videobridge/sip-communicator.properties"
+build() {
+        rm -rf ${_pkgbase}
+        mkdir ${_pkgbase}
+        tar xJf data.tar.xz -C ${_pkgbase}
 }
 
-# vim: set ts=2 sw=2 et:
+package() {
+        cd "$srcdir/${_pkgbase}"
+
+        DESTDIR="${pkgdir}/usr/lib/${_pkgbase}"
+        CONFDIR="${pkgdir}/etc/${_pkgbase}"
+
+        install -dm755 "${DESTDIR}"
+        cp -R usr/share/jitsi-videobridge/* "${DESTDIR}"
+        rm "${DESTDIR}"/{collect-dump-logs.sh,graceful_shutdown.sh}
+
+        chown -R root:root "${DESTDIR}"
+
+        install -dm750 "${CONFDIR}"
+        install -Dm640 -t "${CONFDIR}" etc/jitsi/videobridge/*
+        sed -i 's@/var/log/jitsi@/var/log/'${_pkgbase}'@' "${CONFDIR}/log4j2.xml"
+
+        install -Dm644 "etc/sysctl.d/20-jvb-udp-buffers.conf" "${pkgdir}/etc/sysctl.d/${_pkgbase}.conf"
+
+        cd "$srcdir"
+        install -Dm640 -t "${CONFDIR}" "config" "sip-communicator.properties"
+        install -Dm644 "service" "${pkgdir}/usr/lib/systemd/system/${_pkgbase}.service"
+        install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${_pkgbase}.conf"
+        install -Dm644 "tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgbase}.conf"
+}
+sha256sums=('694f5afd5ecc123ec0e8fe5186adf38f3989fa7a2c9a80c0d316c7622527888a'
+            '5c79dc1e1f5ee04eba3da987c488fc53cb6e4348345cab05ab0ed6d7000f3d9d'
+            'cc9fbf77497bce3c9673b2d144928f11cdd0c0823940c2b60c8369a2f086b9b7'
+            'f87c5250acba49a62ae55293059281764a6dc8cd99acf23e4b1b8bbee03b4fb1'
+            '998cbc64def56ab98080ff7150dd0913a5e10325cd2b038cf3db14baf8cb19fc'
+            '4dd8141e71bbf73b39cf242902e1c1a84a38dc3160ff89e76883d999af10541c'
+            '59c2b2068205d6972c4b25bf1bbed9aaf08ff395b28309888cfe9b386dc29fa0')
diff --git a/config b/config
index 0a61f06f5848..08014d1e54fc 100644
--- a/config
+++ b/config
@@ -18,8 +18,8 @@ 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_HOME_DIR_LOCATION=/etc\
+  -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jitsi-videobridge\
   -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi-videobridge\
-  -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties\
+  -Djava.util.logging.config.file=/etc/jitsi-videobridge/logging.properties\
 "
diff --git a/jitsi.install b/jitsi.install
new file mode 100644
index 000000000000..f51b4d7075ef
--- /dev/null
+++ b/jitsi.install
@@ -0,0 +1,6 @@
+post_install() {
+	cat << __EOF__
+The configs are located here:
+  - /etc/jitsi-videobridge
+__EOF__
+}
diff --git a/jitsi-videobridge.service b/service
index fe892aa1dac4..e349e8fadeef 100644
--- a/jitsi-videobridge.service
+++ b/service
@@ -1,18 +1,20 @@
 [Unit]
-Description=Jitsi Videobridge
-After=network.target
+Description=Jitsi-Meet Videobridge
+After=network-online.target
 
 [Service]
-EnvironmentFile=/etc/jitsi/videobridge/config
-User=jitsi-videobridge
-ExecStart=/usr/share/jitsi-videobridge/jvb.sh --host=${JVB_HOST} --domain=${JVB_HOSTNAME} --port=${JVB_PORT} --secret=${JVB_SECRET} ${JVB_OPTS}
-WorkingDirectory=~
+EnvironmentFile=/etc/jitsi-videobridge/config
+User=jvb
+ExecStart=/usr/lib/jitsi-videobridge/jvb.sh ${JVB_OPTS}
+WorkingDirectory=/var/lib/jitsi-videobridge
 StateDirectory=jitsi-videobridge
 StateDirectoryMode=0750
 LogsDirectory=jitsi-videobridge
 LogsDirectoryMode=0750
 
 Restart=on-failure
+RestartSec=2
+
 SuccessExitStatus=143
 
 # more threads for this process
diff --git a/sysusers.conf b/sysusers.conf
index ea7619bbb577..a9677d4caad5 100644
--- a/sysusers.conf
+++ b/sysusers.conf
@@ -1,2 +1,2 @@
 g jitsi
-u jitsi-videobridge -:jitsi - /var/lib/jitsi-videobridge
+u jvb -:jitsi - /var/lib/jitsi-videobridge
diff --git a/tmpfiles.conf b/tmpfiles.conf
index bfbcfbccc16f..729c34faebb2 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1 +1,2 @@
-z /etc/jitsi/videobridge 0750 root jitsi
+Z /etc/jitsi-videobridge 0640 jvb jitsi
+z /etc/jitsi-videobridge 0750 jvb jitsi