Hi,
I've attached new ports for jitsi and a meta package (PKGNAME is jitsi for simplicity).
Things I'd appreciate feedback on -
* should I name the meta package something different? my aim was to just be able to do `pkg_add jitsi` and then you should have everything you need.
* versioning for the meta package is just starting with 1.0 and any updates/changes would follow normal rules of backward compatibility and breaking changes.
* someone should try to setup a server with the README instructions and see if they work for you.
Any other feedback is also good to have.
packages attached -
* jitsi-srtp: openssl bindings for encryption
* jitsi-prosody-plugins: additional plugins to be used for jitsi
* jitsi-meta: the meta package
also attached a patch to update the samples in current ports to follow the README directions.
Best,
Aisha
diff --git a/net/jitsi/Makefile b/net/jitsi/Makefile
index 1528296e6ff..fecd8176094 100644
--- a/net/jitsi/Makefile
+++ b/net/jitsi/Makefile
@@ -1,6 +1,9 @@
SUBDIR =
SUBDIR += jicofo
SUBDIR += meet
+SUBDIR += prosody-plugins
+SUBDIR += srtp
SUBDIR += videobridge
+SUBDIR += meta
.include <bsd.port.subdir.mk>
diff --git a/net/jitsi/jicofo/Makefile b/net/jitsi/jicofo/Makefile
index d13e12e23e4..303d8c5618d 100644
--- a/net/jitsi/jicofo/Makefile
+++ b/net/jitsi/jicofo/Makefile
@@ -4,7 +4,7 @@ CATEGORIES = net
VERSION = 2.0.7648
PKGNAME = jicofo-${VERSION}
-REVISION = 0
+REVISION = 1
GH_ACCOUNT = jitsi
GH_PROJECT = jicofo
diff --git a/net/jitsi/jicofo/files/jicofo.conf b/net/jitsi/jicofo/files/jicofo.conf
index 087d8765e59..240f899374c 100644
--- a/net/jitsi/jicofo/files/jicofo.conf
+++ b/net/jitsi/jicofo/files/jicofo.conf
@@ -44,11 +44,11 @@ jicofo {
// The separate XMPP connection used for communication with clients (endpoints).
client {
enabled = true
- hostname = "auth.jitsi.example.com"
+ hostname = "auth.jitsi"
port = 5222
- domain = auth.jitsi.example.com
+ domain = "auth.jitsi.example.com"
username = "focus"
- password = "CHANGE_ME"
+ password = "${FOCUS_COMP_PASS}"
// A flag to suppress the TLS certificate verification. XXX really?
disable-certificate-verification = false
diff --git a/net/jitsi/jicofo/files/jicofo.in.sh b/net/jitsi/jicofo/files/jicofo.in.sh
index 644c63497c6..f0cf9fd18c6 100644
--- a/net/jitsi/jicofo/files/jicofo.in.sh
+++ b/net/jitsi/jicofo/files/jicofo.in.sh
@@ -1,6 +1,6 @@
JICOFO_CONF=${SYSCONFDIR}/jicofo/jicofo.conf
-JICOFO_LOG_CONFIG=${TRUEPREFIX}/share/jicofo/lib/logging.properties
-JICOFO_TRUSTSTORE=${SYSCONFDIR}/ssl/jicofo-key.store
-JICOFO_TRUSTSTORE_PASSWORD='CHANGE_ME'
+JICOFO_LOG_CONFIG=${SYSCONFDIR}/jicofo/logging.properties
+JICOFO_TRUSTSTORE=${SYSCONFDIR}/ssl/jitsi.store
+JICOFO_TRUSTSTORE_PASSWORD='${JAVA_TS_PASS}'
JICOFO_MAXMEM=3G
JICOFO_DHKEYSIZE=2048
diff --git a/net/jitsi/jicofo/pkg/PLIST b/net/jitsi/jicofo/pkg/PLIST
index 42336871387..e2ad416a1d7 100644
--- a/net/jitsi/jicofo/pkg/PLIST
+++ b/net/jitsi/jicofo/pkg/PLIST
@@ -29,4 +29,4 @@ share/jicofo/lib/
share/jicofo/lib/logging.properties.sample
@mode 640
@group _jicofo
-@sample share/jicofo/lib/logging.properties
+@sample ${SYSCONFDIR}/jicofo/logging.properties
diff --git a/net/jitsi/videobridge/Makefile b/net/jitsi/videobridge/Makefile
index d1f7be24dc4..3195b82a9aa 100644
--- a/net/jitsi/videobridge/Makefile
+++ b/net/jitsi/videobridge/Makefile
@@ -4,7 +4,7 @@ CATEGORIES = net
VERSION = 2.0.7648
DISTNAME = jitsi-videobridge-${VERSION}
-REVISION = 0
+REVISION = 1
GH_ACCOUNT = jitsi
GH_PROJECT = jitsi-videobridge
diff --git a/net/jitsi/videobridge/files/jvb.conf b/net/jitsi/videobridge/files/jvb.conf
index abf99167c40..3a125a29c19 100644
--- a/net/jitsi/videobridge/files/jvb.conf
+++ b/net/jitsi/videobridge/files/jvb.conf
@@ -10,10 +10,10 @@ videobridge {
presence-interval = 120s
configs {
ourprosody {
- hostname = "xmpp"
+ hostname = "auth.jitsi"
domain = "auth.jitsi.example.com"
username = "jvb"
- password = "CHANGE_ME"
+ password = "${JVB_COMP_PASS}"
muc_jids = "JvbBrewery@internal.auth.jitsi.example.com"
muc_nickname = "jvb"
disable_certificate_verification = true
diff --git a/net/jitsi/videobridge/files/jvb.in.sh b/net/jitsi/videobridge/files/jvb.in.sh
index 678c8d3558d..fac3f3fe940 100644
--- a/net/jitsi/videobridge/files/jvb.in.sh
+++ b/net/jitsi/videobridge/files/jvb.in.sh
@@ -1,7 +1,7 @@
JVB_CONF=${SYSCONFDIR}/jvb/jvb.conf
-JVB_LOG_CONFIG=${TRUEPREFIX}/share/jvb/lib/logging.properties
-JVB_TRUSTSTORE=${SYSCONFDIR}/ssl/jvb-key.store
-JVB_TRUSTSTORE_PASSWORD='CHANGE_ME'
+JVB_LOG_CONFIG=${SYSCONFDIR}/jvb/logging.properties
+JVB_TRUSTSTORE=${SYSCONFDIR}/ssl/jitsi.store
+JVB_TRUSTSTORE_PASSWORD='${JAVA_TS_PASS}'
JVB_MAXMEM=3G
JVB_DHKEYSIZE=2048
JVB_GC_TYPE=G1GC
diff --git a/net/jitsi/videobridge/files/sip-communicator.properties b/net/jitsi/videobridge/files/sip-communicator.properties
index e4668008d12..f764d843cc8 100644
--- a/net/jitsi/videobridge/files/sip-communicator.properties
+++ b/net/jitsi/videobridge/files/sip-communicator.properties
@@ -1,3 +1,3 @@
-org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=XX.XX.XX.XX
-org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=ZZ.ZZ.ZZ.ZZ
+#org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${LOCAL_ADDRESS}
+#org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${PUBLIC_ADDRESS}
org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
diff --git a/net/jitsi/videobridge/pkg/PLIST b/net/jitsi/videobridge/pkg/PLIST
index 90500239795..fdb4ba387e4 100644
--- a/net/jitsi/videobridge/pkg/PLIST
+++ b/net/jitsi/videobridge/pkg/PLIST
@@ -27,7 +27,7 @@ share/jvb/lib/
share/jvb/lib/logging.properties.sample
@mode 640
@group _jvb
-@sample share/jvb/lib/logging.properties
+@sample ${SYSCONFDIR}/jvb/logging.properties
@mode
@group
share/jvb/lib/sip-communicator.properties.sample
No comments:
Post a Comment