Revert "jicofo, jigasi, jvb: fix SENTRY_DSN not being read"

This reverts commit fa2b4db2d1c2fefe7dbcbd923ffe3711b2fa4a07.

docker-compose.yml

@@ -353,7 +353,7 @@ services:
             - MAX_BRIDGE_PARTICIPANTS
             - OCTO_BRIDGE_SELECTION_STRATEGY
             - PROSODY_VISITORS_MUC_PREFIX
-            - SENTRY_DSN
+            - SENTRY_DSN="${JICOFO_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - TZ
@@ -416,7 +416,7 @@ services:
             - JVB_XMPP_PORT
             - JVB_XMPP_SERVER
             - PUBLIC_URL
-            - SENTRY_DSN
+            - SENTRY_DSN="${JVB_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - COLIBRI_REST_ENABLED

jicofo/rootfs/defaults/logging.properties

@@ -1,9 +1,7 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
-handlers=java.util.logging.ConsoleHandler
+handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL

jigasi.yml

@@ -48,7 +48,7 @@ services:
             - GC_CLIENT_ID
             - GC_CLIENT_CERT_URL
             - SHUTDOWN_REST_ENABLED
-            - SENTRY_DSN
+            - SENTRY_DSN="${JIGASI_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - TZ

jigasi/rootfs/defaults/logging.properties

@@ -1,6 +1,4 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
 handlers=java.util.logging.ConsoleHandler

jvb/rootfs/defaults/logging.properties

@@ -1,9 +1,7 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
-handlers=java.util.logging.ConsoleHandler
+handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL