diff --git a/base/Dockerfile b/base/Dockerfile index 78beebf6f558ab22792233480260cceb5c126946..960595a12f0ac61dfcef4aab6bfa0adbf9423b06 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -12,6 +12,7 @@ RUN rm ./install.sh ./install-list ./mail-enumeration-leak.patch ./files_version FROM nextcloud:${MARKETTING_VERSION}-fpm-alpine ENV VERSION $PATCH_VERSION +ENV VISIO_URL=https://meet.liiib.re RUN apk add --no-cache patch jq COPY redis.ini /usr/local/etc/php/conf.d/ COPY opcache-recommended.ini /usr/local/etc/php/conf.d/opcache.ini diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php index 00e8aaf7babac5c953085a8741599a3be7666d30..d20f4344362e564f6ff00b7df3537ee8c828ca5e 100644 --- a/base/apps/indie_external/lib/SitesManager.php +++ b/base/apps/indie_external/lib/SitesManager.php @@ -114,8 +114,8 @@ class SitesManager { $site['url'] = str_replace(['{email}', '{uid}', '{displayname}', '{chat_url}', '{saml_idp_url}', '{saml_realm}', '{quota_url}'], [$email, $uid, $displayName, $chat_url, $saml_idp_url, $saml_realm, $quota_url], $site['url']); if ($site['name'] === 'Visio') { - $visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL'); - if ($visio_url) { + $visio_url = getenv('VISIO_URL', true); + if ($visio_url) { // if VISIO_URL is empty, we use the default provided in the json $site['url'] = $visio_url; } } @@ -187,13 +187,11 @@ class SitesManager { } if ($site['name'] === 'Visio') { - $visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL'); - if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json - if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item - continue; - } else { - $site['url'] = $visio_url; - } + $visio_url = getenv('VISIO_URL', true); + if (!$visio_url) { // if VISIO_URL is empty, we use the default provided in the json + continue; + } else { + $site['url'] = $visio_url; } } diff --git a/ci/functions b/ci/functions index 3b184eb1a9ebfc367cdd2d69fbce2e61dd665075..2486bef3597473293808ba8c19c98fd11e651740 100644 --- a/ci/functions +++ b/ci/functions @@ -38,7 +38,7 @@ function build_web() { function test_build() { print_versions - export DESTINATION: "--no-push" + export DESTINATION="--no-push" build_base }