update stable

5 files changed, 27 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f30dcb080464..40ce2560d706 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = jitsi-videobridge-bin
 	pkgdesc = Jitsi Meet Videobridge binary
-	pkgver = 2.1+304+g8488f77d
+	pkgver = 2.1+351+g0bfaac1c
 	pkgrel = 1
 	url = https://jitsi.org/jitsi-meet/
 	install = jitsi.install
 	arch = any
 	license = Apache
 	makedepends = tar
+	makedepends = unzip
 	depends = java-runtime
 	depends = bash
 	optdepends = prosody
@@ -17,19 +18,20 @@ pkgbase = jitsi-videobridge-bin
 	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-304-g8488f77d-1_all.deb
+	backup = etc/jitsi-videobridge/jvb.conf
+	source = https://download.jitsi.org/stable/jitsi-videobridge2_2.1-351-g0bfaac1c-1_all.deb
 	source = config
 	source = sip-communicator.properties
 	source = service
 	source = sysusers.conf
 	source = tmpfiles.conf
 	source = jitsi.install
-	sha256sums = 80f098cc861c1c8acfbb933fe359342f2e5eacf749b0a463855b4dd2db15f18d
-	sha256sums = 5c79dc1e1f5ee04eba3da987c488fc53cb6e4348345cab05ab0ed6d7000f3d9d
+	sha256sums = 372613cd0af65b45ec4ae9bb48f305add7b6b01615f3dffe52aa7164cddfc919
+	sha256sums = d3c62e021edb1a17ba21fd62c328dd99df4ead44044a2850f25e34448f781a76
 	sha256sums = cc9fbf77497bce3c9673b2d144928f11cdd0c0823940c2b60c8369a2f086b9b7
-	sha256sums = f87c5250acba49a62ae55293059281764a6dc8cd99acf23e4b1b8bbee03b4fb1
+	sha256sums = 5d78e8eec07c6aae84a1f1c0922f951217741ccc6f1a50ed7ef966c665bbf291
 	sha256sums = 998cbc64def56ab98080ff7150dd0913a5e10325cd2b038cf3db14baf8cb19fc
-	sha256sums = 4dd8141e71bbf73b39cf242902e1c1a84a38dc3160ff89e76883d999af10541c
+	sha256sums = 8a8f2fd5d02f196dff0ce7ceb75e45d19028a9f22dc9e55653ab17cce29051af
 	sha256sums = 59c2b2068205d6972c4b25bf1bbed9aaf08ff395b28309888cfe9b386dc29fa0
 
 pkgname = jitsi-videobridge-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7c3f64fd6811..5cbc1a3e9127 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _basename=jitsi
 _pkgname=videobridge
-_tag=2.1-304-g8488f77d
-_version=2.1+304+g8488f77d
+_tag=2.1-351-g0bfaac1c
+_version=2.1+351+g0bfaac1c
 
 _pkgbase=${_basename}-${_pkgname}
 _debname=${_basename}-${_pkgname}2
@@ -17,13 +17,14 @@ url="https://jitsi.org/jitsi-meet/"
 license=('Apache')
 depends=("java-runtime" "bash")
 optdepends=("prosody")
-makedepends=('tar')
+makedepends=('tar' 'unzip')
 options=('!strip')
 backup=(
   "etc/${_pkgbase}/config"
   "etc/${_pkgbase}/log4j2.xml"
   "etc/${_pkgbase}/logging.properties"
   "etc/${_pkgbase}/sip-communicator.properties"
+  "etc/${_pkgbase}/jvb.conf"
 )
 source=(
         "https://download.jitsi.org/stable/${_debname}_${_tag}-1_all.deb"
@@ -56,22 +57,24 @@ package() {
 
         chown -R root:root "${DESTDIR}"
 
-        install -dm750 "${CONFDIR}"
-        install -Dm640 -t "${CONFDIR}" etc/jitsi/videobridge/*
+        install -dm700 "${CONFDIR}"
+        install -Dm600 -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"
+        unzip "$srcdir/${_pkgbase}/usr/share/jitsi-videobridge/jitsi-videobridge.jar" reference.conf
+        mv reference.conf jvb.conf
+        install -Dm600 -t "${CONFDIR}" "config" "sip-communicator.properties" "jvb.conf"
         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=('80f098cc861c1c8acfbb933fe359342f2e5eacf749b0a463855b4dd2db15f18d'
-            '5c79dc1e1f5ee04eba3da987c488fc53cb6e4348345cab05ab0ed6d7000f3d9d'
+sha256sums=('372613cd0af65b45ec4ae9bb48f305add7b6b01615f3dffe52aa7164cddfc919'
+            'd3c62e021edb1a17ba21fd62c328dd99df4ead44044a2850f25e34448f781a76'
             'cc9fbf77497bce3c9673b2d144928f11cdd0c0823940c2b60c8369a2f086b9b7'
-            'f87c5250acba49a62ae55293059281764a6dc8cd99acf23e4b1b8bbee03b4fb1'
+            '5d78e8eec07c6aae84a1f1c0922f951217741ccc6f1a50ed7ef966c665bbf291'
             '998cbc64def56ab98080ff7150dd0913a5e10325cd2b038cf3db14baf8cb19fc'
-            '4dd8141e71bbf73b39cf242902e1c1a84a38dc3160ff89e76883d999af10541c'
+            '8a8f2fd5d02f196dff0ce7ceb75e45d19028a9f22dc9e55653ab17cce29051af'
             '59c2b2068205d6972c4b25bf1bbed9aaf08ff395b28309888cfe9b386dc29fa0')
diff --git a/config b/config
index 08014d1e54fc..e6fb09cb7f8e 100644
--- a/config
+++ b/config
@@ -22,4 +22,6 @@ JAVA_SYS_PROPS="\
   -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\
+  -Dconfig.file=/etc/jitsi-videobridge/jvb.conf\
+  -Djava.util.prefs.userRoot=/var/lib/jitsi-videobridge\
 "
diff --git a/service b/service
index e349e8fadeef..0322fb770750 100644
--- a/service
+++ b/service
@@ -11,6 +11,8 @@ StateDirectory=jitsi-videobridge
 StateDirectoryMode=0750
 LogsDirectory=jitsi-videobridge
 LogsDirectoryMode=0750
+ConfigurationDirectory=jitsi-videobridge
+ConfigurationDirectoryMode=0700
 
 Restart=on-failure
 RestartSec=2
diff --git a/tmpfiles.conf b/tmpfiles.conf
index 729c34faebb2..6914a1648d05 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1,2 +1,2 @@
-Z /etc/jitsi-videobridge 0640 jvb jitsi
-z /etc/jitsi-videobridge 0750 jvb jitsi
+Z /etc/jitsi-videobridge 0600 jvb jitsi
+z /etc/jitsi-videobridge 0700 jvb jitsi