From d486d38e5f3b71c630ea4fd34c667a428e4144da Mon Sep 17 00:00:00 2001
From: A75G <31223569+A75G@users.noreply.github.com>
Date: Thu, 9 Apr 2020 07:38:42 +0300
Subject: [PATCH] fix

---
 templates/jitsi-jicofo.xml  |  2 +-
 templates/jitsi-jvb.xml     |  2 +-
 templates/jitsi-prosody.xml | 28 ++++++++++++++--------------
 templates/jitsi-web.xml     |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/jitsi-jicofo.xml b/templates/jitsi-jicofo.xml
index 4328757..a539d5b 100644
--- a/templates/jitsi-jicofo.xml
+++ b/templates/jitsi-jicofo.xml
@@ -19,7 +19,7 @@
   <DonateLink/>
   <Description>Jicofo image for Jitsi Meet</Description>
   <Labels/>
-  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/jicofo/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/jicofo/</Config>
+  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/jicofo/" Mode="rw" Description="IMPORTENT Change to /mnt/user/appdata/jitsi/jicofo/" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/jitsi/jicofo/</Config>
   <Config Name="ENABLE_AUTH" Target="ENABLE_AUTH" Default="1" Mode="" Description="Enable authentication" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
   <Config Name="XMPP_DOMAIN" Target="XMPP_DOMAIN" Default="meet.jitsi" Mode="" Description="Internal XMPP domain" Type="Variable" Display="always" Required="false" Mask="false">meet.jitsi</Config>
   <Config Name="XMPP_AUTH_DOMAIN" Target="XMPP_AUTH_DOMAIN" Default="auth.meet.jitsi" Mode="" Description="Internal XMPP domain for authenticated services" Type="Variable" Display="always" Required="false" Mask="false">auth.meet.jitsi</Config>
diff --git a/templates/jitsi-jvb.xml b/templates/jitsi-jvb.xml
index 3d4ae18..e9bdd5e 100644
--- a/templates/jitsi-jvb.xml
+++ b/templates/jitsi-jvb.xml
@@ -21,7 +21,7 @@
   <Labels/>
   <Config Name="JVB_PORT" Target="10000" Default="10000" Mode="udp" Description="Media port for the Jitsi Videobridge" Type="Port" Display="always" Required="false" Mask="false">10000</Config>
   <Config Name="JVB_TCP_PORT" Target="4443" Default="4443" Mode="tcp" Description="TCP Fallback for Jitsi Videobridge for when UDP isn&#x2019;t available" Type="Port" Display="always" Required="false" Mask="false">4443</Config>
-  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/jvb/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/jvb/</Config>
+  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/jvb/" Mode="rw" Description="IMPORTENT Change to /mnt/user/appdata/jitsi/jvb/" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/jitsi/jvb/</Config>
   <Config Name="DOCKER_HOST_ADDRESS" Target="DOCKER_HOST_ADDRESS" Default="192.168.1.1" Mode="" Description="IP address of the Docker host, needed for LAN environments" Type="Variable" Display="always" Required="false" Mask="false">192.168.1.1</Config>
   <Config Name="XMPP_AUTH_DOMAIN" Target="XMPP_AUTH_DOMAIN" Default="auth.meet.jitsi" Mode="" Description="Internal XMPP domain for authenticated services" Type="Variable" Display="always" Required="false" Mask="false">auth.meet.jitsi</Config>
   <Config Name="XMPP_INTERNAL_MUC_DOMAIN" Target="XMPP_INTERNAL_MUC_DOMAIN" Default="internal-muc.meet.jitsi" Mode="" Description="XMPP domain for the internal MUC" Type="Variable" Display="always" Required="false" Mask="false">internal-muc.meet.jitsi</Config>
diff --git a/templates/jitsi-prosody.xml b/templates/jitsi-prosody.xml
index 868f32c..c19effd 100644
--- a/templates/jitsi-prosody.xml
+++ b/templates/jitsi-prosody.xml
@@ -22,25 +22,12 @@
   <Config Name="Port 1" Target="5222" Default="5222" Mode="tcp" Description="Container Port: 5222" Type="Port" Display="always" Required="false" Mask="false">5222</Config>
   <Config Name="Port 2" Target="5347" Default="5347" Mode="tcp" Description="Container Port: 5347" Type="Port" Display="always" Required="false" Mask="false">5347</Config>
   <Config Name="Port 3" Target="5280" Default="5280" Mode="tcp" Description="Container Port: 5280" Type="Port" Display="always" Required="false" Mask="false">5280</Config>
-  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/prosody/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/prosody/</Config>
+  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/prosody/" Mode="rw" Description="IMPORTENT Change to /mnt/user/appdata/jitsi/prosody/" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/jitsi/prosody/</Config>
   <Config Name="AUTH_TYPE" Target="AUTH_TYPE" Default="internal" Mode="" Description="Select authentication type (internal, jwt or ldap)" Type="Variable" Display="always" Required="false" Mask="false">internal</Config>
   <Config Name="ENABLE_AUTH" Target="ENABLE_AUTH" Default="1" Mode="" Description="Enable authentication" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
   <Config Name="ENABLE_GUESTS" Target="ENABLE_GUESTS" Default="1" Mode="" Description="Enable guest access" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
   <Config Name="GLOBAL_MODULES" Target="GLOBAL_MODULES" Default="statistics,alert" Mode="" Description="Custom prosody modules to load in global configuration (comma separated)" Type="Variable" Display="always" Required="false" Mask="false">statistics,alert</Config>
   <Config Name="GLOBAL_CONFIG" Target="GLOBAL_CONFIG" Default="foo = bar;\nkey = val;" Mode="" Description="Custom configuration string with escaped newlines" Type="Variable" Display="always" Required="false" Mask="false">foo = bar;\nkey = val;</Config>
-  <Config Name="LDAP_URL" Target="LDAP_URL" Default="ldaps://ldap.domain.com/" Mode="" Description="URL for ldap connection" Type="Variable" Display="always" Required="false" Mask="false">ldaps://ldap.domain.com/</Config>
-  <Config Name="LDAP_BASE" Target="LDAP_BASE" Default="DC=example,DC=domain,DC=com" Mode="" Description="LDAP base DN. Can be empty." Type="Variable" Display="always" Required="false" Mask="false">DC=example,DC=domain,DC=com</Config>
-  <Config Name="LDAP_BINDDN" Target="LDAP_BINDDN" Default="CN=binduser,OU=users,DC=example,DC=domain,DC=com" Mode="" Description="LDAP user DN. Do not specify this parameter for the anonymous bind." Type="Variable" Display="always" Required="false" Mask="false">CN=binduser,OU=users,DC=example,DC=domain,DC=com</Config>
-  <Config Name="LDAP_BINDPW" Target="LDAP_BINDPW" Default="LdapUserPassw0rd" Mode="" Description="LDAP user password. Do not specify this parameter for the anonymous bind." Type="Variable" Display="always" Required="false" Mask="false">LdapUserPassw0rd</Config>
-  <Config Name="LDAP_FILTER" Target="LDAP_FILTER" Default="(sAMAccountName=%u)" Mode="" Description="LDAP filter." Type="Variable" Display="always" Required="false" Mask="false">(sAMAccountName=%u)</Config>
-  <Config Name="LDAP_AUTH_METHOD" Target="LDAP_AUTH_METHOD" Default="bind" Mode="" Description="LDAP authentication method." Type="Variable" Display="always" Required="false" Mask="false">bind</Config>
-  <Config Name="LDAP_VERSION" Target="LDAP_VERSION" Default="3" Mode="" Description="LDAP protocol version" Type="Variable" Display="always" Required="false" Mask="false">3</Config>
-  <Config Name="LDAP_USE_TLS" Target="LDAP_USE_TLS" Default="1" Mode="" Description="Enable LDAP TLS" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
-  <Config Name="LDAP_TLS_CIPHERS" Target="LDAP_TLS_CIPHERS" Default="SECURE256:SECURE128" Mode="" Description="Set TLS ciphers list to allow" Type="Variable" Display="always" Required="false" Mask="false">SECURE256:SECURE128</Config>
-  <Config Name="LDAP_TLS_CHECK_PEER" Target="LDAP_TLS_CHECK_PEER" Default="1" Mode="" Description="Require and verify LDAP server certificate" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
-  <Config Name="LDAP_TLS_CACERT_FILE" Target="LDAP_TLS_CACERT_FILE" Default="/etc/ssl/certs/ca-certificates.crt" Mode="" Description="Path to CA cert file. Used when server certificate verification is enabled" Type="Variable" Display="always" Required="false" Mask="false">/etc/ssl/certs/ca-certificates.crt</Config>
-  <Config Name="LDAP_TLS_CACERT_DIR" Target="LDAP_TLS_CACERT_DIR" Default="/etc/ssl/certs" Mode="" Description="Path to CA certs directory. Used when server certificate verification is enabled." Type="Variable" Display="always" Required="false" Mask="false">/etc/ssl/certs</Config>
-  <Config Name="LDAP_START_TLS" Target="LDAP_START_TLS" Default="0" Mode="" Description="Enable START_TLS, requires LDAPv3, URL must be ldap:// not ldaps://" Type="Variable" Display="always" Required="false" Mask="false">0</Config>
   <Config Name="XMPP_DOMAIN" Target="XMPP_DOMAIN" Default="meet.jitsi" Mode="" Description="Internal XMPP domain" Type="Variable" Display="always" Required="false" Mask="false">meet.jitsi</Config>
   <Config Name="XMPP_AUTH_DOMAIN" Target="XMPP_AUTH_DOMAIN" Default="auth.meet.jitsi" Mode="" Description="Internal XMPP domain for authenticated services" Type="Variable" Display="always" Required="false" Mask="false">auth.meet.jitsi</Config>
   <Config Name="XMPP_GUEST_DOMAIN" Target="XMPP_GUEST_DOMAIN" Default="guest.meet.jitsi" Mode="" Description="XMPP domain for unauthenticated users" Type="Variable" Display="always" Required="false" Mask="false">guest.meet.jitsi</Config>
@@ -70,4 +57,17 @@
   <Config Name="JWT_AUTH_TYPE" Target="JWT_AUTH_TYPE" Default="token" Mode="" Description="(Optional) Controls which module is used for processing incoming JWTs" Type="Variable" Display="always" Required="false" Mask="false">token</Config>
   <Config Name="JWT_TOKEN_AUTH_MODULE" Target="JWT_TOKEN_AUTH_MODULE" Default="token_verification" Mode="" Description="(Optional) Controls which module is used for validating JWTs" Type="Variable" Display="always" Required="false" Mask="false">token_verification</Config>
   <Config Name="LOG_LEVEL" Target="LOG_LEVEL" Default="info" Mode="" Description="Controls which logs are output from prosody and associated modules" Type="Variable" Display="always" Required="false" Mask="false">info</Config>
+  <Config Name="LDAP_URL" Target="LDAP_URL" Default="ldaps://ldap.domain.com/" Mode="" Description="URL for ldap connection" Type="Variable" Display="always" Required="false" Mask="false">ldaps://ldap.domain.com/</Config>
+  <Config Name="LDAP_BASE" Target="LDAP_BASE" Default="DC=example,DC=domain,DC=com" Mode="" Description="LDAP base DN. Can be empty." Type="Variable" Display="always" Required="false" Mask="false">DC=example,DC=domain,DC=com</Config>
+  <Config Name="LDAP_BINDDN" Target="LDAP_BINDDN" Default="CN=binduser,OU=users,DC=example,DC=domain,DC=com" Mode="" Description="LDAP user DN. Do not specify this parameter for the anonymous bind." Type="Variable" Display="always" Required="false" Mask="false">CN=binduser,OU=users,DC=example,DC=domain,DC=com</Config>
+  <Config Name="LDAP_BINDPW" Target="LDAP_BINDPW" Default="LdapUserPassw0rd" Mode="" Description="LDAP user password. Do not specify this parameter for the anonymous bind." Type="Variable" Display="always" Required="false" Mask="false">LdapUserPassw0rd</Config>
+  <Config Name="LDAP_FILTER" Target="LDAP_FILTER" Default="(sAMAccountName=%u)" Mode="" Description="LDAP filter." Type="Variable" Display="always" Required="false" Mask="false">(sAMAccountName=%u)</Config>
+  <Config Name="LDAP_AUTH_METHOD" Target="LDAP_AUTH_METHOD" Default="bind" Mode="" Description="LDAP authentication method." Type="Variable" Display="always" Required="false" Mask="false">bind</Config>
+  <Config Name="LDAP_VERSION" Target="LDAP_VERSION" Default="3" Mode="" Description="LDAP protocol version" Type="Variable" Display="always" Required="false" Mask="false">3</Config>
+  <Config Name="LDAP_USE_TLS" Target="LDAP_USE_TLS" Default="1" Mode="" Description="Enable LDAP TLS" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
+  <Config Name="LDAP_TLS_CIPHERS" Target="LDAP_TLS_CIPHERS" Default="SECURE256:SECURE128" Mode="" Description="Set TLS ciphers list to allow" Type="Variable" Display="always" Required="false" Mask="false">SECURE256:SECURE128</Config>
+  <Config Name="LDAP_TLS_CHECK_PEER" Target="LDAP_TLS_CHECK_PEER" Default="1" Mode="" Description="Require and verify LDAP server certificate" Type="Variable" Display="always" Required="false" Mask="false">1</Config>
+  <Config Name="LDAP_TLS_CACERT_FILE" Target="LDAP_TLS_CACERT_FILE" Default="/etc/ssl/certs/ca-certificates.crt" Mode="" Description="Path to CA cert file. Used when server certificate verification is enabled" Type="Variable" Display="always" Required="false" Mask="false">/etc/ssl/certs/ca-certificates.crt</Config>
+  <Config Name="LDAP_TLS_CACERT_DIR" Target="LDAP_TLS_CACERT_DIR" Default="/etc/ssl/certs" Mode="" Description="Path to CA certs directory. Used when server certificate verification is enabled." Type="Variable" Display="always" Required="false" Mask="false">/etc/ssl/certs</Config>
+  <Config Name="LDAP_START_TLS" Target="LDAP_START_TLS" Default="0" Mode="" Description="Enable START_TLS, requires LDAPv3, URL must be ldap:// not ldaps://" Type="Variable" Display="always" Required="false" Mask="false">0</Config>
 </Container>
\ No newline at end of file
diff --git a/templates/jitsi-web.xml b/templates/jitsi-web.xml
index b1c86cd..e8b5c63 100644
--- a/templates/jitsi-web.xml
+++ b/templates/jitsi-web.xml
@@ -21,7 +21,7 @@
   <Labels/>
   <Config Name="HTTP" Target="80" Default="80" Mode="tcp" Description="HTTP" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
   <Config Name="HTTPS" Target="443" Default="443" Mode="tcp" Description="HTTPS" Type="Port" Display="always" Required="false" Mask="false">4443</Config>
-  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/web/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/web/</Config>
+  <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/jitsi/web/" Mode="rw" Description="IMPORTENT Change to /mnt/user/appdata/jitsi/web/" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/jitsi/web/</Config>
   <Config Name="LetsEncrypt" Target="/etc/letsencrypt" Default="/mnt/user/appdata/jitsi/web/letsencrypt/" Mode="rw" Description="Container Path: /etc/letsencrypt" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/web/letsencrypt/</Config>
   <Config Name="Transcripts" Target="/usr/share/jitsi-meet/transcripts" Default="/mnt/user/appdata/jitsi/transcripts/" Mode="rw" Description="Container Path: /usr/share/jitsi-meet/transcripts" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/jitsi/transcripts/</Config>
   <Config Name="ENABLE_AUTH" Target="ENABLE_AUTH" Default="1" Mode="" Description="Enable authentication: 0 OR 1" Type="Variable" Display="always" Required="false" Mask="false">1</Config>