2
0
Эх сурвалжийг харах

misc: fix handling boolean values

Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/30
Saúl Ibarra Corretgé 6 жил өмнө
parent
commit
30c425811e

+ 1 - 1
base/Dockerfile

@@ -4,7 +4,7 @@ ARG JITSI_RELEASE=stable
 
 ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz /tmp/s6-overlay.tar.gz
 ADD https://download.jitsi.org/jitsi-key.gpg.key /tmp/jitsi.key
-ADD https://github.com/subchen/frep/releases/download/v1.3.3/frep-1.3.3-linux-amd64 /usr/bin/frep
+ADD https://github.com/subchen/frep/releases/download/v1.3.5/frep-1.3.5-linux-amd64 /usr/bin/frep
 
 COPY rootfs /
 

+ 1 - 1
jicofo/rootfs/defaults/sip-communicator.properties

@@ -5,6 +5,6 @@ org.jitsi.jicofo.BRIDGE_MUC={{ .Env.JVB_BREWERY_MUC }}@{{ .Env.XMPP_INTERNAL_MUC
 org.jitsi.jicofo.jigasi.BREWERY={{ .Env.JIGASI_BREWERY_MUC}}@{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}
 {{ end }}
 
-{{ if .Env.ENABLE_AUTH }}
+{{ if .Env.ENABLE_AUTH | default "0" | toBool }}
 org.jitsi.jicofo.auth.URL=XMPP:{{ .Env.XMPP_DOMAIN }}
 {{ end }}

+ 1 - 1
jigasi/rootfs/defaults/sip-communicator.properties

@@ -92,7 +92,7 @@ org.jitsi.jigasi.BREWERY_ENABLED=true
 
 org.jitsi.jigasi.xmpp.acc.IS_SERVER_OVERRIDDEN=true
 org.jitsi.jigasi.xmpp.acc.SERVER_ADDRESS={{ .Env.XMPP_SERVER }}
-{{ if .Env.ENABLE_AUTH }}
+{{ if .Env.ENABLE_AUTH | default "0" | toBool }}
 org.jitsi.jigasi.xmpp.acc.USER_ID={{ .Env.JIGASI_XMPP_USER }}@{{ .Env.XMPP_AUTH_DOMAIN }}
 org.jitsi.jigasi.xmpp.acc.PASS={{ .Env.JIGASI_XMPP_PASSWORD }}
 org.jitsi.jigasi.xmpp.acc.ANONYMOUS_AUTH=false

+ 2 - 2
prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

@@ -2,7 +2,7 @@ admins = { "{{ .Env.JICOFO_AUTH_USER }}@{{ .Env.XMPP_AUTH_DOMAIN }}" }
 plugin_paths = { "/prosody-plugins-custom" }
 
 VirtualHost "{{ .Env.XMPP_DOMAIN }}"
-    {{ if .Env.ENABLE_AUTH }}
+    {{ if .Env.ENABLE_AUTH | default "0" | toBool }}
     authentication = "internal_plain"
     {{ else }}
     authentication = "anonymous"
@@ -22,7 +22,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
 
     c2s_require_encryption = false
 
-{{ if and .Env.ENABLE_AUTH .Env.ENABLE_GUESTS }}
+{{ if and (.Env.ENABLE_AUTH | default "0" | toBool) (.Env.ENABLE_GUESTS | default "0" | toBool) }}
 VirtualHost "{{ .Env.XMPP_GUEST_DOMAIN }}"
     authentication = "anonymous"
     c2s_require_encryption = false

+ 2 - 2
web/rootfs/defaults/default

@@ -1,14 +1,14 @@
 server {
 	listen 80 default_server;
 
-	{{ if .Env.ENABLE_HTTP_REDIRECT }}
+	{{ if .Env.ENABLE_HTTP_REDIRECT | default "0" | toBool }}
 	return 301 https://$host$request_uri;
 	{{ else }}
 	include /config/nginx/meet.conf;
 	{{ end }}
 }
 
-{{ if not .Env.DISABLE_HTTPS }}
+{{ if not (.Env.DISABLE_HTTPS | default "0" | toBool) }}
 server {
 	listen 443 ssl;
 

+ 1 - 1
web/rootfs/defaults/ssl.conf

@@ -7,7 +7,7 @@ ssl_session_tickets off;
 ssl_dhparam /config/nginx/dhparams.pem;
 
 # ssl certs
-{{ if .Env.ENABLE_LETSENCRYPT }}
+{{ if .Env.ENABLE_LETSENCRYPT | default "0" | toBool }}
 ssl_certificate /etc/letsencrypt/live/{{ .Env.LETSENCRYPT_DOMAIN }}/fullchain.pem;
 ssl_certificate_key /etc/letsencrypt/live/{{ .Env.LETSENCRYPT_DOMAIN }}/privkey.pem;
 {{ else }}