diff --git a/app/config/errors.php b/app/config/errors.php index 16fad57de1..a9ca0f79dd 100644 --- a/app/config/errors.php +++ b/app/config/errors.php @@ -139,6 +139,11 @@ return [ 'description' => 'There was an error processing your request. Please check the inputs and try again.', 'code' => 400, ], + Exception::GENERAL_FEATURE_UNSUPPORTED => [ + 'name' => Exception::GENERAL_FEATURE_UNSUPPORTED, + 'description' => 'This feature is not supported with your current configuration.', + 'code' => 400, + ], /** User Errors */ Exception::USER_COUNT_EXCEEDED => [ diff --git a/app/config/platform.php b/app/config/platform.php index 17dfd72217..21aedaad98 100644 --- a/app/config/platform.php +++ b/app/config/platform.php @@ -24,6 +24,7 @@ return [ System::getEnv('_APP_CONSOLE_DOMAIN', 'localhost'), System::getEnv('_APP_MIGRATION_HOST'), ])), + 'schemas' => \array_filter(\explode(',', System::getEnv('_APP_CONSOLE_SCHEMA', ''))), 'platformName' => APP_EMAIL_PLATFORM_NAME, 'logoUrl' => APP_EMAIL_LOGO_URL, 'accentColor' => APP_EMAIL_ACCENT_COLOR, diff --git a/app/config/variables.php b/app/config/variables.php index d7ab66cf57..7a3ed13049 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -358,15 +358,6 @@ return [ 'question' => '', 'filter' => '' ], - [ - 'name' => '_APP_DB_ADAPTER', - 'description' => 'Which database adapter to use. Must be one of: mariadb, postgresql.', - 'introduction' => '1.6.0', - 'default' => 'mariadb', - 'required' => true, - 'question' => 'Choose your database (mariadb|postgresql)', - 'filter' => '' - ], [ 'name' => '_APP_TRUSTED_HEADERS', 'description' => 'This option allows you to set the list of trusted headers, the value is a comma‑separated list of HTTP header names, evaluated left-to-right for the first valid IP. Header names are treated case-insensitively.', @@ -379,13 +370,73 @@ return [ ], ], [ - 'name' => '_APP_DB_ADAPTER', - 'description' => 'Which database engine to use. Possible options are "mariadb" or "mongodb"', - 'introduction' => '1.8.0', - 'default' => 'mongoDB', - 'required' => true, - 'question' => 'Choose your database (mariadb|mongoDB)', - 'filter' => '' + 'category' => 'Database', + 'description' => 'Appwrite uses a database for storing user and meta data. You can choose between MariaDB, MongoDB or PostgreSQL.', + 'variables' => [ + [ + 'name' => '_APP_DB_ADAPTER', + 'description' => 'Which database to use. Must be one of: MariaDB, MongoDB, or PostgreSQL', + 'introduction' => '1.9.0', + 'default' => 'mongodb', + 'required' => true, + 'question' => 'Choose your database (mariadb|mongodb|postgresql)', + 'filter' => '' + ], + [ + 'name' => '_APP_DB_HOST', + 'description' => 'Database server host name address. Default value is: \'mongodb\'.', + 'introduction' => '', + 'default' => 'mongodb', + 'required' => false, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_DB_PORT', + 'description' => 'Database server TCP port. Default value is: \'27017\'.', + 'introduction' => '', + 'default' => '27017', + 'required' => false, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_DB_SCHEMA', + 'description' => 'Database server database schema. Default value is: \'appwrite\'.', + 'introduction' => '', + 'default' => 'appwrite', + 'required' => false, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_DB_USER', + 'description' => 'Database server user name. Default value is: \'user\'.', + 'introduction' => '', + 'default' => 'user', + 'required' => false, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_DB_PASS', + 'description' => 'Database server user password. Default value is: \'password\'.', + 'introduction' => '', + 'default' => 'password', + 'required' => false, + 'question' => '', + 'filter' => 'password' + ], + [ + 'name' => '_APP_DB_ROOT_PASS', + 'description' => 'Database server root password. Default value is: \'rootsecretpassword\'.', + 'introduction' => '', + 'default' => 'rootsecretpassword', + 'required' => false, + 'question' => '', + 'filter' => 'password' + ], + ], ], [ 'category' => 'Redis', @@ -429,66 +480,6 @@ return [ ], ], ], - [ - 'category' => 'MariaDB', - 'description' => 'Appwrite is using a MariaDB server for managing persistent database data. The MariaDB env vars are used to allow Appwrite server to connect to the MariaDB container.', - 'variables' => [ - [ - 'name' => '_APP_DB_HOST', - 'description' => 'MariaDB server host name address. Default value is: \'mariadb\'.', - 'introduction' => '', - 'default' => 'mariadb', - 'required' => false, - 'question' => '', - 'filter' => '' - ], - [ - 'name' => '_APP_DB_PORT', - 'description' => 'MariaDB server TCP port. Default value is: \'3306\'.', - 'introduction' => '', - 'default' => '3306', - 'required' => false, - 'question' => '', - 'filter' => '' - ], - [ - 'name' => '_APP_DB_SCHEMA', - 'description' => 'MariaDB server database schema. Default value is: \'appwrite\'.', - 'introduction' => '', - 'default' => 'appwrite', - 'required' => false, - 'question' => '', - 'filter' => '' - ], - [ - 'name' => '_APP_DB_USER', - 'description' => 'MariaDB server user name. Default value is: \'user\'.', - 'introduction' => '', - 'default' => 'user', - 'required' => false, - 'question' => '', - 'filter' => '' - ], - [ - 'name' => '_APP_DB_PASS', - 'description' => 'MariaDB server user password. Default value is: \'password\'.', - 'introduction' => '', - 'default' => 'password', - 'required' => false, - 'question' => '', - 'filter' => 'password' - ], - [ - 'name' => '_APP_DB_ROOT_PASS', - 'description' => 'MariaDB server root password. Default value is: \'rootsecretpassword\'.', - 'introduction' => '', - 'default' => 'rootsecretpassword', - 'required' => false, - 'question' => '', - 'filter' => 'password' - ], - ], - ], [ 'category' => 'InfluxDB', 'description' => 'Deprecated since 1.4.8.',