Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: Merge

Browse source
This commit is contained in:
Binyamin Yawitz 2024-07-19 10:00:06 -04:00
parent f7a28bcf71
commit cfdf5ff5cb
No known key found for this signature in database
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/init.php
View file

@ -1,6 +1,5 @@
<?php <?php
//
///*
///** ///**
// * Init // * Init
// * // *
@ -119,7 +118,7 @@
//const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours //const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
//const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours //const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
//const APP_CACHE_BUSTER = 4314; //const APP_CACHE_BUSTER = 4314;
//const APP_VERSION_STABLE = '1.5.7'; //const APP_VERSION_STABLE = '1.6.0';
//const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; //const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
//const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; //const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
//const APP_DATABASE_ATTRIBUTE_IP = 'ip'; //const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@ -784,20 +783,20 @@
// $group = new Group(); // $group = new Group();
// //
// $fallbackForDB = 'db_main=' . AppwriteURL::unparse([ // $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
// 'scheme' => 'mariadb', // 'scheme' => 'mariadb',
// 'host' => System::getEnv('_APP_DB_HOST', 'mariadb'), // 'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
// 'port' => System::getEnv('_APP_DB_PORT', '3306'), // 'port' => System::getEnv('_APP_DB_PORT', '3306'),
// 'user' => System::getEnv('_APP_DB_USER', ''), // 'user' => System::getEnv('_APP_DB_USER', ''),
// 'pass' => System::getEnv('_APP_DB_PASS', ''), // 'pass' => System::getEnv('_APP_DB_PASS', ''),
// 'path' => System::getEnv('_APP_DB_SCHEMA', ''), // 'path' => System::getEnv('_APP_DB_SCHEMA', ''),
// ]); // ]);
// $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([ // $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
// 'scheme' => 'redis', // 'scheme' => 'redis',
// 'host' => System::getEnv('_APP_REDIS_HOST', 'redis'), // 'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
// 'port' => System::getEnv('_APP_REDIS_PORT', '6379'), // 'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
// 'user' => System::getEnv('_APP_REDIS_USER', ''), // 'user' => System::getEnv('_APP_REDIS_USER', ''),
// 'pass' => System::getEnv('_APP_REDIS_PASS', ''), // 'pass' => System::getEnv('_APP_REDIS_PASS', ''),
// ]); // ]);
// //
// $connections = [ // $connections = [
// 'console' => [ // 'console' => [
@ -1143,7 +1142,7 @@
// if ( // if (
// isset($node['type']) && // isset($node['type']) &&
// ($node['type'] === Origin::CLIENT_TYPE_WEB || // ($node['type'] === Origin::CLIENT_TYPE_WEB ||
// $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) && // $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) &&
// !empty($node['hostname']) // !empty($node['hostname'])
// ) { // ) {
// $clients[] = $node['hostname']; // $clients[] = $node['hostname'];
@ -1732,4 +1731,4 @@
//}, ['request']); //}, ['request']);
//App::setResource('plan', function (array $plan = []) { //App::setResource('plan', function (array $plan = []) {
// return []; // return [];
//});*/ //});

2
app/init/constants.php
View file

@ -29,7 +29,7 @@ const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
const APP_CACHE_BUSTER = 331; const APP_CACHE_BUSTER = 331;
const APP_VERSION_STABLE = '1.5.0'; const APP_VERSION_STABLE = '1.6.0';
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
const APP_DATABASE_ATTRIBUTE_IP = 'ip'; const APP_DATABASE_ATTRIBUTE_IP = 'ip';