From aa48d5145f8b9d2774bf747077e1f00fb64b47e4 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 14 Jan 2021 16:51:39 +0000 Subject: [PATCH] Runs update.sh --- 18.0/apache/config/apps.config.php | 14 +++++------ 18.0/apache/config/autoconfig.php | 26 ++++++++++----------- 18.0/fpm-alpine/config/apps.config.php | 14 +++++------ 18.0/fpm-alpine/config/autoconfig.php | 26 ++++++++++----------- 18.0/fpm/config/apps.config.php | 14 +++++------ 18.0/fpm/config/autoconfig.php | 26 ++++++++++----------- 19.0/apache/config/apps.config.php | 14 +++++------ 19.0/apache/config/autoconfig.php | 26 ++++++++++----------- 19.0/fpm-alpine/config/apps.config.php | 14 +++++------ 19.0/fpm-alpine/config/autoconfig.php | 26 ++++++++++----------- 19.0/fpm/config/apps.config.php | 14 +++++------ 19.0/fpm/config/autoconfig.php | 26 ++++++++++----------- 20.0/apache/config/apps.config.php | 14 +++++------ 20.0/apache/config/autoconfig.php | 26 ++++++++++----------- 20.0/fpm-alpine/config/apps.config.php | 14 +++++------ 20.0/fpm-alpine/config/autoconfig.php | 26 ++++++++++----------- 20.0/fpm/config/apps.config.php | 14 +++++------ 20.0/fpm/config/autoconfig.php | 26 ++++++++++----------- 21.0-beta/apache/config/apps.config.php | 14 +++++------ 21.0-beta/apache/config/autoconfig.php | 26 ++++++++++----------- 21.0-beta/fpm-alpine/config/apps.config.php | 14 +++++------ 21.0-beta/fpm-alpine/config/autoconfig.php | 26 ++++++++++----------- 21.0-beta/fpm/config/apps.config.php | 14 +++++------ 21.0-beta/fpm/config/autoconfig.php | 26 ++++++++++----------- 24 files changed, 240 insertions(+), 240 deletions(-) diff --git a/18.0/apache/config/apps.config.php b/18.0/apache/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/18.0/apache/config/apps.config.php +++ b/18.0/apache/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/18.0/apache/config/autoconfig.php b/18.0/apache/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/18.0/apache/config/autoconfig.php +++ b/18.0/apache/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/18.0/fpm-alpine/config/apps.config.php b/18.0/fpm-alpine/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/18.0/fpm-alpine/config/apps.config.php +++ b/18.0/fpm-alpine/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/18.0/fpm-alpine/config/autoconfig.php b/18.0/fpm-alpine/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/18.0/fpm-alpine/config/autoconfig.php +++ b/18.0/fpm-alpine/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/18.0/fpm/config/apps.config.php b/18.0/fpm/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/18.0/fpm/config/apps.config.php +++ b/18.0/fpm/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/18.0/fpm/config/autoconfig.php b/18.0/fpm/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/18.0/fpm/config/autoconfig.php +++ b/18.0/fpm/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/19.0/apache/config/apps.config.php b/19.0/apache/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/19.0/apache/config/apps.config.php +++ b/19.0/apache/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/19.0/apache/config/autoconfig.php b/19.0/apache/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/19.0/apache/config/autoconfig.php +++ b/19.0/apache/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/19.0/fpm-alpine/config/apps.config.php b/19.0/fpm-alpine/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/19.0/fpm-alpine/config/apps.config.php +++ b/19.0/fpm-alpine/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/19.0/fpm-alpine/config/autoconfig.php b/19.0/fpm-alpine/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/19.0/fpm-alpine/config/autoconfig.php +++ b/19.0/fpm-alpine/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/19.0/fpm/config/apps.config.php b/19.0/fpm/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/19.0/fpm/config/apps.config.php +++ b/19.0/fpm/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/19.0/fpm/config/autoconfig.php b/19.0/fpm/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/19.0/fpm/config/autoconfig.php +++ b/19.0/fpm/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/20.0/apache/config/apps.config.php b/20.0/apache/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/20.0/apache/config/apps.config.php +++ b/20.0/apache/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/20.0/apache/config/autoconfig.php b/20.0/apache/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/20.0/apache/config/autoconfig.php +++ b/20.0/apache/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/20.0/fpm-alpine/config/apps.config.php b/20.0/fpm-alpine/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/20.0/fpm-alpine/config/apps.config.php +++ b/20.0/fpm-alpine/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/20.0/fpm-alpine/config/autoconfig.php b/20.0/fpm-alpine/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/20.0/fpm-alpine/config/autoconfig.php +++ b/20.0/fpm-alpine/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/20.0/fpm/config/apps.config.php b/20.0/fpm/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/20.0/fpm/config/apps.config.php +++ b/20.0/fpm/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/20.0/fpm/config/autoconfig.php b/20.0/fpm/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/20.0/fpm/config/autoconfig.php +++ b/20.0/fpm/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/21.0-beta/apache/config/apps.config.php b/21.0-beta/apache/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/21.0-beta/apache/config/apps.config.php +++ b/21.0-beta/apache/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/21.0-beta/apache/config/autoconfig.php b/21.0-beta/apache/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/21.0-beta/apache/config/autoconfig.php +++ b/21.0-beta/apache/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/21.0-beta/fpm-alpine/config/apps.config.php b/21.0-beta/fpm-alpine/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/21.0-beta/fpm-alpine/config/apps.config.php +++ b/21.0-beta/fpm-alpine/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/21.0-beta/fpm-alpine/config/autoconfig.php b/21.0-beta/fpm-alpine/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/21.0-beta/fpm-alpine/config/autoconfig.php +++ b/21.0-beta/fpm-alpine/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; } diff --git a/21.0-beta/fpm/config/apps.config.php b/21.0-beta/fpm/config/apps.config.php index a4bed833..4c37f72a 100644 --- a/21.0-beta/fpm/config/apps.config.php +++ b/21.0-beta/fpm/config/apps.config.php @@ -1,15 +1,15 @@ array ( + 'apps_paths' => array ( 0 => array ( - "path" => OC::$SERVERROOT."/apps", - "url" => "/apps", - "writable" => false, + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => false, ), 1 => array ( - "path" => OC::$SERVERROOT."/custom_apps", - "url" => "/custom_apps", - "writable" => true, + 'path' => OC::$SERVERROOT.'/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, ), ), ); diff --git a/21.0-beta/fpm/config/autoconfig.php b/21.0-beta/fpm/config/autoconfig.php index 5bb85d42..f01f18d6 100644 --- a/21.0-beta/fpm/config/autoconfig.php +++ b/21.0-beta/fpm/config/autoconfig.php @@ -3,25 +3,25 @@ $autoconfig_enabled = false; if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $AUTOCONFIG['dbtype'] = 'sqlite'; + $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE'); $autoconfig_enabled = true; } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { - $AUTOCONFIG["dbtype"] = "mysql"; - $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); - $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); - $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $AUTOCONFIG['dbtype'] = 'mysql'; + $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER'); + $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST'); $autoconfig_enabled = true; } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { - $AUTOCONFIG["dbtype"] = "pgsql"; - $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); - $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); - $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); - $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $AUTOCONFIG['dbtype'] = 'pgsql'; + $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB'); + $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER'); + $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST'); $autoconfig_enabled = true; } if ($autoconfig_enabled) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; + $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data'; }