mirror of
https://github.com/nextcloud/docker.git
synced 2024-11-17 18:46:43 +01:00
backwards compatibility
Signed-off-by: Melvin mngmt-02 <melvin@suter.dev> Signed-off-by: Melvin Suter <github@suter.dev>
This commit is contained in:
parent
a16b4f71cc
commit
d13714b973
9 changed files with 45 additions and 9 deletions
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
|
||||||
|
// Get originaly configured values
|
||||||
|
include(__DIR__.'/config.php');
|
||||||
|
|
||||||
|
// Add environment variables
|
||||||
$CONFIG = array(
|
$CONFIG = array(
|
||||||
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
|
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue