Attachment 213966 Details for Bug 246069 – touch-ups to polish rcfile, pkg-message and Makefile

[patch] touch-ups to polish rcfile, pkg-message and Makefile

jicofo.patch (text/plain), 4.54 KB, created by Matthias Andree on 2020-05-01 00:51:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2020-05-01 00:51:42 UTC

Size: 4.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 533419)
>+++ Makefile	(Arbeitskopie)
>@@ -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_RC_SUBR=	${PORTNAME}
> SUB_FILES+=	pkg-message
>+SUB_LIST+=	JAVA=${JAVA}
> ETCDIR=		${PREFIX}/etc/jitsi/jicofo
> 
> DEV_UPDATE_MODE=	no
>Index: files/jicofo.in
>===================================================================
>--- files/jicofo.in	(Revision 533419)
>+++ files/jicofo.in	(Arbeitskopie)
>@@ -7,8 +7,9 @@
> # KEYWORD: shutdown
> #
> # 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,9 +16,10 @@
> 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}"
> 
>@@ -24,9 +26,9 @@
> : ${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,7 +37,8 @@
> 
> 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} \
>@@ -42,16 +45,17 @@
>                 -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} \
>                 --domain=${JVB_XMPP_DOMAIN} \
>                 --port=${JVB_XMPP_PORT} \
>-                --secret=${JVB_XMPP_SECRET} \
>+                "--secret=${JVB_XMPP_SECRET}" \
> 		--user_domain=${JVB_XMPP_USER_DOMAIN} \
> 		--user_name=${JVB_XMPP_USER_NAME} \
>-		--user_password=${JVB_XMPP_USER_SECRET} ${jicofo_flags}
>+		"--user_password=${JVB_XMPP_USER_SECRET}" \
>+		${jicofo_flags}
> 		echo "Started"
> }
> 
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(Revision 533419)
>+++ files/pkg-message.in	(Arbeitskopie)
>@@ -1,30 +1,28 @@
> [
> { type: install
>   message: <<EOM
>-Jitsi Conference Focus was installed
>+Jitsi Conference Focus was installed, and needs further configuration:
> 
>-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
>+  # openssl x509 -in /path/to/prosody/auth.jitsi.example.com.crt \
>+     -outform der -out /path/to/prosody/auth.jitsi.example.com.der
>+  # keytool -noprompt -keystore %%ETCDIR%%/truststore.jks -importcert \
>+     -alias prosody -file /path/to/prosody/auth.jitsi.example.com.der
> 
>-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
>-   available on FreeBSD >= 12.x
>-
>-5) Enjoy it
>+   jicofo's rc script uses ${name}_env_file functionality,
>+   which is only available on FreeBSD >= 12.x.
> EOM
> }
> ]

Actions: View | Diff

Attachments on bug 246069: 213966