aboutsummaryrefslogtreecommitdiff
path: root/cluster/prod/app/jitsi/build/jitsi-conference-focus
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-08-24 15:42:47 +0200
committerAlex Auvolat <alex@adnab.me>2022-08-24 15:42:47 +0200
commit2e8923b383eb06c53261eee8e5c442b857fb67e4 (patch)
tree0ad148f75f7b54dfed2dbac8f43f6df9badc502a /cluster/prod/app/jitsi/build/jitsi-conference-focus
parent9848f3090f77363a2fda0f9fa673ebcf1fb8228c (diff)
downloadnixcfg-2e8923b383eb06c53261eee8e5c442b857fb67e4.tar.gz
nixcfg-2e8923b383eb06c53261eee8e5c442b857fb67e4.zip
Move app files into cluster subdirectories; add prod garage
Diffstat (limited to 'cluster/prod/app/jitsi/build/jitsi-conference-focus')
-rw-r--r--cluster/prod/app/jitsi/build/jitsi-conference-focus/0001-Remove-broken-command-line-args-parameters-setting.patch91
-rw-r--r--cluster/prod/app/jitsi/build/jitsi-conference-focus/Dockerfile26
-rwxr-xr-xcluster/prod/app/jitsi/build/jitsi-conference-focus/jicofo11
3 files changed, 128 insertions, 0 deletions
diff --git a/cluster/prod/app/jitsi/build/jitsi-conference-focus/0001-Remove-broken-command-line-args-parameters-setting.patch b/cluster/prod/app/jitsi/build/jitsi-conference-focus/0001-Remove-broken-command-line-args-parameters-setting.patch
new file mode 100644
index 0000000..14d48c5
--- /dev/null
+++ b/cluster/prod/app/jitsi/build/jitsi-conference-focus/0001-Remove-broken-command-line-args-parameters-setting.patch
@@ -0,0 +1,91 @@
+From 3da458fc04560e8ddd597f7910c4f53b714d58ab Mon Sep 17 00:00:00 2001
+From: Quentin Dufour <quentin@dufour.io>
+Date: Mon, 1 Feb 2021 06:53:21 +0100
+Subject: [PATCH] Remove broken command line args parameters setting
+
+---
+ src/main/java/org/jitsi/jicofo/Main.java | 61 ------------------------
+ 1 file changed, 61 deletions(-)
+
+diff --git a/src/main/java/org/jitsi/jicofo/Main.java b/src/main/java/org/jitsi/jicofo/Main.java
+index 558d1b3..59e04bb 100644
+--- a/src/main/java/org/jitsi/jicofo/Main.java
++++ b/src/main/java/org/jitsi/jicofo/Main.java
+@@ -50,7 +50,6 @@ public static void main(String[] args)
+ logger.error("An uncaught exception occurred in thread=" + t, e));
+
+ setupMetaconfigLogger();
+- setSystemProperties(args);
+ JitsiConfig.Companion.reloadNewConfig();
+
+ // Make sure that passwords are not printed by ConfigurationService
+@@ -80,66 +79,6 @@ public static void main(String[] args)
+ JicofoServices.jicofoServicesSingleton = null;
+ }
+
+- /**
+- * Read the command line arguments and env variables, and set the corresponding system properties used for
+- * configuration of the XMPP component and client connections.
+- */
+- private static void setSystemProperties(String[] args)
+- throws ParseException
+- {
+- CmdLine cmdLine = new CmdLine();
+-
+- // We may end execution here if one of required arguments is missing
+- cmdLine.parse(args);
+-
+- // XMPP host/domain
+- String host;
+- String componentDomain;
+- // Try to get domain, can be null after this call(we'll fix that later)
+- componentDomain = cmdLine.getOptionValue("domain");
+- // Host name
+- host = cmdLine.getOptionValue("--host", componentDomain == null ? "localhost" : componentDomain);
+- // Try to fix component domain
+- if (isBlank(componentDomain))
+- {
+- componentDomain = host;
+- }
+- if (componentDomain != null)
+- {
+- // For backward compat, the "--domain" command line argument controls the domain for the XMPP component
+- // as well as XMPP client connection.
+- System.setProperty(XmppClientConnectionConfig.legacyXmppDomainPropertyName, componentDomain);
+- }
+- if (host != null)
+- {
+- // For backward compat, the "--host" command line argument controls the hostname for the XMPP component
+- // as well as XMPP client connection.
+- System.setProperty(XmppClientConnectionConfig.legacyHostnamePropertyName, host);
+- }
+-
+- // XMPP client connection
+- String focusDomain = cmdLine.getOptionValue("--user_domain");
+- String focusUserName = cmdLine.getOptionValue("--user_name");
+- String focusPassword = cmdLine.getOptionValue("--user_password");
+- if (isBlank(focusPassword))
+- {
+- focusPassword = System.getenv("JICOFO_AUTH_PASSWORD");
+- }
+-
+- if (focusDomain != null)
+- {
+- System.setProperty(XmppClientConnectionConfig.legacyDomainPropertyName, focusDomain);
+- }
+- if (focusUserName != null)
+- {
+- System.setProperty(XmppClientConnectionConfig.legacyUsernamePropertyName, focusUserName);
+- }
+- if (isNotBlank(focusPassword))
+- {
+- System.setProperty(XmppClientConnectionConfig.legacyPasswordPropertyName, focusPassword);
+- }
+- }
+-
+ private static void setupMetaconfigLogger()
+ {
+ org.jitsi.utils.logging2.Logger configLogger = new org.jitsi.utils.logging2.LoggerImpl("org.jitsi.config");
+--
+2.25.1
+
diff --git a/cluster/prod/app/jitsi/build/jitsi-conference-focus/Dockerfile b/cluster/prod/app/jitsi/build/jitsi-conference-focus/Dockerfile
new file mode 100644
index 0000000..241c61b
--- /dev/null
+++ b/cluster/prod/app/jitsi/build/jitsi-conference-focus/Dockerfile
@@ -0,0 +1,26 @@
+FROM debian:bookworm AS builder
+
+# unzip is required when executing the mvn package command
+RUN apt-get update && \
+ apt-get install -y openjdk-11-jdk-headless maven git unzip
+
+ARG JICOFO_TAG
+RUN git clone --depth 1 --branch $JICOFO_TAG https://github.com/jitsi/jicofo
+
+WORKDIR jicofo
+COPY *.patch .
+RUN git apply 0001-Remove-broken-command-line-args-parameters-setting.patch
+RUN mvn package -DskipTests -Dassembly.skipAssembly=false
+
+RUN unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
+ mv jicofo-1.1-SNAPSHOT /srv/build
+
+FROM debian:bookworm
+
+RUN apt-get update && \
+ apt-get install -y openjdk-11-jre-headless ca-certificates
+
+COPY --from=builder /srv/build /usr/share/jicofo
+COPY jicofo /usr/local/bin
+
+CMD ["/usr/local/bin/jicofo"]
diff --git a/cluster/prod/app/jitsi/build/jitsi-conference-focus/jicofo b/cluster/prod/app/jitsi/build/jitsi-conference-focus/jicofo
new file mode 100755
index 0000000..8fc8fce
--- /dev/null
+++ b/cluster/prod/app/jitsi/build/jitsi-conference-focus/jicofo
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+update-ca-certificates -f
+
+exec java \
+ -Dlog4j2.formatMsgNoLookups=true \
+ -Djdk.tls.ephemeralDHKeySize=2048 \
+ -Djava.util.logging.config.file=/usr/share/jicofo/lib/logging.properties \
+ -Dconfig.file=/etc/jitsi/jicofo.conf \
+ -cp "/usr/share/jicofo/*:/usr/share/jicofo/lib/*" \
+ org.jitsi.jicofo.Main