summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorC0rn3j2020-05-03 10:18:47 +0200
committerC0rn3j2020-05-03 10:18:47 +0200
commit2decd0a1e9216ce277c26c15b3be8cd3cfe61d75 (patch)
tree41295f4b31116c8314beb4e5b2d825072295cf0a
parent2ac9f979392fd3410beea147a35391fd7aed9459 (diff)
downloadaur-2decd0a1e9216ce277c26c15b3be8cd3cfe61d75.tar.gz
JVB2 changes
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD15
-rw-r--r--config31
-rw-r--r--service4
-rw-r--r--sip-communicator.properties1
6 files changed, 50 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 088cb3ab608..79d28246546 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jicofo-git
pkgdesc = JItsi Meet COnference FOcus
- pkgver = r1153.039cfe38
+ pkgver = r1180.54741839
pkgrel = 1
url = https://github.com/jitsi/jicofo
arch = x86_64
@@ -11,13 +11,15 @@ pkgbase = jicofo-git
depends = java-runtime-headless
provides = jicofo
conflicts = jicofo
- backup = etc/jicofo/jicofo.conf
+ backup = etc/jitsi/jicofo/jicofo.conf
source = jicofo-git::git+https://github.com/jitsi/jicofo
- source = service
source = config
+ source = service
+ source = sip-communicator.properties
sha256sums = SKIP
- sha256sums = c1e17cf1de2274d375d08afee1853e1314d74763ec600b7bba740cfb7df09258
- sha256sums = fea884f52b5c91b7514212d989fae36fd2113967c2617fae1b686ac6c774a7f8
+ sha256sums = 3a558324a17011cf48e033ce265d45cc06a0b53e009984e841496f1cd4d7519d
+ sha256sums = 9c587f58a3c157b3a3f9412017df60e60610ecb342958f041faccb12ca795445
+ sha256sums = ed3a2c91d3f6c92f3aeae4dd852f04196ed57cc0c8a33da3bae6c1fb26b88294
pkgname = jicofo-git
diff --git a/.gitignore b/.gitignore
index aaca6fbbadd..18b51aa93e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
!.gitignore
!service
!config
+!sip-communicator.properties
diff --git a/PKGBUILD b/PKGBUILD
index c84b7244e07..bd703b37923 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Martin Rys <rys.pw/#contact_me>
pkgname=jicofo-git
-pkgver=r1153.039cfe38
+pkgver=r1180.54741839
pkgrel=1
epoch=
pkgdesc="JItsi Meet COnference FOcus"
@@ -15,17 +15,19 @@ optdepends=()
provides=("jicofo")
conflicts=("jicofo")
replaces=()
-backup=("etc/jicofo/jicofo.conf")
+backup=("etc/jitsi/jicofo/jicofo.conf")
options=()
install=
changelog=
source=($pkgname::git+https://github.com/jitsi/jicofo
+ config
service
- config)
+ sip-communicator.properties)
noextract=()
sha256sums=("SKIP"
- "c1e17cf1de2274d375d08afee1853e1314d74763ec600b7bba740cfb7df09258"
- "fea884f52b5c91b7514212d989fae36fd2113967c2617fae1b686ac6c774a7f8")
+ "3a558324a17011cf48e033ce265d45cc06a0b53e009984e841496f1cd4d7519d"
+ "9c587f58a3c157b3a3f9412017df60e60610ecb342958f041faccb12ca795445"
+ "ed3a2c91d3f6c92f3aeae4dd852f04196ed57cc0c8a33da3bae6c1fb26b88294")
validpgpkeys=()
pkgver() {
@@ -43,5 +45,6 @@ package() {
install -d "${pkgdir}/opt"
cp -R "${srcdir}/jicofo-git/jicofo-1.1-SNAPSHOT/" "${pkgdir}/opt/jicofo"
install -Dm644 service "$pkgdir"/usr/lib/systemd/system/jicofo.service
- install -Dm644 config "$pkgdir"/etc/jicofo/jicofo.conf
+ install -Dm644 config "$pkgdir"/etc/jitsi/jicofo/jicofo.conf
+ install -Dm644 sip-communicator.properties "${pkgdir}"/etc/jitsi/jicofo/sip-communicator.properties
}
diff --git a/config b/config
index de0b6edd418..5ed696c02b3 100644
--- a/config
+++ b/config
@@ -1 +1,30 @@
-flags="--host=localhost --domain=jitsi.example.com --secret=YOURSECRET2 --user_domain=auth.jitsi.example.com --user_name=focus --user_password=YOURSECRET3"
+# sets the host name of the XMPP server
+JICOFO_HOST=localhost
+
+# sets the XMPP domain (default: none)
+JICOFO_HOSTNAME=jitsi.example.com
+
+# sets the secret used to authenticate as an XMPP component
+JICOFO_SECRET=YOURSECRET2
+
+# sets the port to use for the XMPP component connection
+JICOFO_PORT=5347
+
+# sets the XMPP domain name to use for XMPP user logins
+JICOFO_AUTH_DOMAIN=auth.jitsi.example.com
+
+# sets the username to use for XMPP user logins
+JICOFO_AUTH_USER=focus
+
+# sets the password to use for XMPP user logins
+JICOFO_AUTH_PASSWORD=YOURSECRET3
+
+# extra options to pass to the jicofo daemon
+JICOFO_OPTS=""
+
+# adds java system props that are passed to jicofo (default are for home and logging config file)
+JAVA_SYS_PROPS="-Xmx3072m\
+ -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi\
+ -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo\
+ -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jicofo\
+ -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties"
diff --git a/service b/service
index 902fd8b5995..eedcd6fcb04 100644
--- a/service
+++ b/service
@@ -5,8 +5,8 @@ After=network-online.target
[Service]
Type=simple
-EnvironmentFile=/etc/jicofo/jicofo.conf
-ExecStart=/opt/jicofo/jicofo.sh ${flags}
+EnvironmentFile=/etc/jitsi/jicofo/jicofo.conf
+ExecStart=/opt/jicofo/jicofo.sh --host=${JICOFO_HOST} --domain=${JICOFO_HOSTNAME} --port=${JICOFO_PORT} --secret=${JICOFO_SECRET} --user_name=${JICOFO_AUTH_USER} --user_domain=${JICOFO_AUTH_DOMAIN} --user_password=${JICOFO_AUTH_PASSWORD} ${JICOFO_OPTS}
Restart=on-failure
[Install]
diff --git a/sip-communicator.properties b/sip-communicator.properties
new file mode 100644
index 00000000000..5007032c574
--- /dev/null
+++ b/sip-communicator.properties
@@ -0,0 +1 @@
+#org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.jitsi.example.com