Date: Tue, 5 May 2020 22:43:06 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534105 - in head/net-im/jicofo: . files Message-ID: <202005052243.045Mh6vs056231@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Tue May 5 22:43:06 2020 New Revision: 534105 URL: https://svnweb.freebsd.org/changeset/ports/534105 Log: - Add some additional instructions related to jicofo configuration on FreeBSD into pkg-message.in file - Reorder jicofo rc script - Now trusted certification is take from /usr/local/etc/jitsi/jicofo/truststore.jks If you are updating please move /usr/local/etc/ssl/java.pem file to /usr/local/etc/jitsi/jicofo/truststore.jks path file - Bump PORTREVISION PR: 246069 Submitted by: mandree Modified: head/net-im/jicofo/Makefile head/net-im/jicofo/files/jicofo.in head/net-im/jicofo/files/pkg-message.in Modified: head/net-im/jicofo/Makefile ============================================================================== --- head/net-im/jicofo/Makefile Tue May 5 20:20:34 2020 (r534104) +++ head/net-im/jicofo/Makefile Tue May 5 22:43:06 2020 (r534105) @@ -2,7 +2,7 @@ PORTNAME= jicofo DISTVERSION= 1.0-555 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im java MAINTAINER= acm@FreeBSD.org @@ -22,6 +22,7 @@ USE_JAVA= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES+= pkg-message +SUB_LIST+= JAVA=${JAVA} ETCDIR= ${PREFIX}/etc/jitsi/jicofo DEV_UPDATE_MODE= no Modified: head/net-im/jicofo/files/jicofo.in ============================================================================== --- head/net-im/jicofo/files/jicofo.in Tue May 5 20:20:34 2020 (r534104) +++ head/net-im/jicofo/files/jicofo.in Tue May 5 22:43:06 2020 (r534105) @@ -8,6 +8,8 @@ # # Configuration settings for jicofo in /etc/rc.conf: # +# jicofo_enable: run jicofo server (default=NO) +# jicofo_flags: additional flags for jicofo server (default="") # . /etc/rc.subr @@ -15,18 +17,19 @@ name="jicofo" rcvar=${name}_enable -jicofo_env_file="%%LOCALBASE%%/etc/jitsi/jicofo/jicofo.conf" +jicofo_env_file="%%ETCDIR%%/jicofo.conf" jicofo_jar="%%JAVAJARDIR%%/jicofo.jar" jicofo_logging_config="%%DATADIR%%/lib/logging.properties" +jicofo_trust_store="%%ETCDIR%%/truststore.jks" load_rc_config "${name}" : ${jicofo_enable="NO"} : ${jicofo_flags=""} -command="%%LOCALBASE%%/bin/java" +command="%%JAVA%%" pidfile="/var/run/jicofo.pid" -required_files="${jicofo_env_file} %%LOCALBASE%%/etc/ssl/java.pem" +required_files="${jicofo_env_file} ${jicofo_trust_store}" start_cmd=${name}_start stop_cmd=${name}_stop @@ -35,14 +38,15 @@ restart_cmd=${name}_restart jicofo_start() { - daemon -p ${pidfile} -o /var/log/${name}.log ${command} -Xmx${MAX_MEMORY} \ + daemon -p ${pidfile} -o /var/log/${name}.log \ + ${command} -Xmx${MAX_MEMORY} \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath=/tmp \ -Djava.util.logging.config.file=${jicofo_logging_config} \ -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \ -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \ -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \ - -Djavax.net.ssl.trustStore=%%LOCALBASE%%/etc/ssl/java.pem \ + -Djavax.net.ssl.trustStore=${jicofo_trust_store} \ -cp ${jicofo_jar} \ org.jitsi.jicofo.Main \ --host=${JVB_XMPP_HOST} \ Modified: head/net-im/jicofo/files/pkg-message.in ============================================================================== --- head/net-im/jicofo/files/pkg-message.in Tue May 5 20:20:34 2020 (r534104) +++ head/net-im/jicofo/files/pkg-message.in Tue May 5 22:43:06 2020 (r534105) @@ -3,25 +3,25 @@ message: <<EOM Jitsi Conference Focus was installed -1) Configuration file is located at: +1) The configuration file is used by the startup rcfile and located at: %%ETCDIR%%/jicofo.conf - Values defined there are used by startup script file - 2) Add jicofo_enable="YES" to /etc/rc.conf. -3) If you are using net-im/prosody with jicofo, do not forget import trusted - certificate file +3) For use of jicofo with net-im/prosody, you need to import prosody's + auth.jitsi.example.com TLS certificate into a Java truststore. + The startup rcfile will pass this filename to jicofo: + %%ETCDIR%%/truststore.jks - for example: - # keytool -noprompt -keystore %%LOCALBASE%%/etc/ssl/java.pem -importcert -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt + # prosodyctl cert generate jitsi.example.com + # prosodyctl cert generate auth.jitsi.example.com + # keytool -noprompt -keystore %%ETCDIR%%/truststore.jks -importcert -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt -4) If you want use jicofo on FreeBSD 11.x, please look for apply the - following patch file: +4) If you want use jicofo on FreeBSD 11.x, please apply the + following patch file: https://reviews.freebsd.org/D14453 - https://reviews.freebsd.org/D14453 - - jicofo rc script use ${name}_env_file functionality. It is + jicofo rc script use ${name}_env_file functionality which is only available on FreeBSD >= 12.x 5) Enjoy it
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005052243.045Mh6vs056231>