silent rollout of split data dir

HaschekSolutions · Nov 3, 2023 · 819c253 · 819c253
1 parent 2388f68
commit 819c253
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh
@@ -56,7 +56,9 @@ _buildConfig() {
     echo "define('FTP_BASEDIR', '${FTP_BASEDIR:-}');"
     echo "define('ENCRYPTION_KEY', '${ENCRYPTION_KEY:-}');"
     echo "define('FFMPEG_BINARY', '${FFMPEG_BINARY:-/usr/bin/ffmpeg}');"
-    echo "define('ALWAYS_WEBP', ${ALWAYS_WEBP:-false});"   
+    echo "define('ALWAYS_WEBP', ${ALWAYS_WEBP:-false});"
+    echo "define('ALLOWED_DOMAINS', ${ALLOWED_DOMAINS:-});"
+    echo "define('SPLIT_DATA_DIR', ${SPLIT_DATA_DIR:-false});"
 }
 
 

diff --git a/inc/core.php b/inc/core.php
@@ -968,7 +968,7 @@ function is_public_ipv6($ip=NULL)
 
 function getDataDir()
 {
-    if(defined('SPLITDATA') && SPLITDATA===true && getDomain())
+    if(defined('SPLIT_DATA_DIR') && SPLIT_DATA_DIR===true && getDomain() && in_array(getDomain(),explode(',',ALLOWED_DOMAINS)))
     {
         $dir = ROOT.DS.'data'.DS.getDomain();
         if(!is_dir($dir)) mkdir($dir);