From 7864b19232710b471febbdfca32b7d2266706f6d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 12:09:09 +0545 Subject: [PATCH 1/9] supporting generating password and secret key --- app/config/variables.php | 48 ++++++++++++++++++++++++++++++++++++++++ app/tasks/install.php | 9 ++++++++ 2 files changed, 57 insertions(+) diff --git a/app/config/variables.php b/app/config/variables.php index 57a9131274..72b69e2722 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -14,6 +14,7 @@ return [ 'default' => 'production', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_LOCALE', @@ -22,6 +23,7 @@ return [ 'default' => 'en', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_OPTIONS_ABUSE', @@ -30,6 +32,7 @@ return [ 'default' => 'enabled', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_OPTIONS_FORCE_HTTPS', @@ -38,6 +41,7 @@ return [ 'default' => 'disabled', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_OPENSSL_KEY_V1', @@ -46,6 +50,7 @@ return [ 'default' => 'your-secret-key', 'required' => true, 'question' => 'Choose a secret API key, make sure to make a backup of your key in a secure location', + 'filter' => 'token' ], [ 'name' => '_APP_DOMAIN', @@ -54,6 +59,7 @@ return [ 'default' => 'localhost', 'required' => true, 'question' => 'Enter your Appwrite hostname', + 'filter' => '' ], [ 'name' => '_APP_DOMAIN_TARGET', @@ -62,6 +68,7 @@ return [ 'default' => 'localhost', 'required' => true, 'question' => 'Enter a DNS A record hostname to serve as a CNAME for your custom domains.\nYou can use the same value as used for the Appwrite hostname.', + 'filter' => '' ], [ 'name' => '_APP_CONSOLE_WHITELIST_ROOT', @@ -70,6 +77,7 @@ return [ 'default' => 'enabled', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_CONSOLE_WHITELIST_EMAILS', @@ -78,6 +86,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], // [ // 'name' => '_APP_CONSOLE_WHITELIST_DOMAINS', @@ -94,6 +103,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SYSTEM_EMAIL_NAME', @@ -102,6 +112,7 @@ return [ 'default' => 'Appwrite', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SYSTEM_EMAIL_ADDRESS', @@ -110,6 +121,7 @@ return [ 'default' => 'team@appwrite.io', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SYSTEM_RESPONSE_FORMAT', @@ -118,6 +130,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', @@ -126,6 +139,7 @@ return [ 'default' => 'certs@appwrite.io', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_USAGE_STATS', @@ -134,6 +148,7 @@ return [ 'default' => 'enabled', 'required' => false, 'question' => '', + 'filter' => '' ] ], ], @@ -148,6 +163,7 @@ return [ 'default' => 'redis', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_REDIS_PORT', @@ -156,6 +172,7 @@ return [ 'default' => '6379', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_REDIS_USER', @@ -164,6 +181,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_REDIS_PASS', @@ -172,6 +190,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], ], ], @@ -186,6 +205,7 @@ return [ 'default' => 'mariadb', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_DB_PORT', @@ -194,6 +214,7 @@ return [ 'default' => '3306', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_DB_SCHEMA', @@ -202,6 +223,7 @@ return [ 'default' => 'appwrite', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_DB_USER', @@ -210,6 +232,7 @@ return [ 'default' => 'user', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_DB_PASS', @@ -218,6 +241,7 @@ return [ 'default' => 'password', 'required' => false, 'question' => '', + 'filter' => 'password' ], ], ], @@ -232,6 +256,7 @@ return [ 'default' => 'influxdb', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_INFLUXDB_PORT', @@ -240,6 +265,7 @@ return [ 'default' => '8086', 'required' => false, 'question' => '', + 'filter' => '' ], ], ], @@ -254,6 +280,7 @@ return [ 'default' => 'telegraf', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_STATSD_PORT', @@ -262,6 +289,7 @@ return [ 'default' => '8125', 'required' => false, 'question' => '', + 'filter' => '' ], ], ], @@ -276,6 +304,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SMTP_PORT', @@ -284,6 +313,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SMTP_SECURE', @@ -292,6 +322,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SMTP_USERNAME', @@ -300,6 +331,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_SMTP_PASSWORD', @@ -308,6 +340,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], ], ], @@ -322,6 +355,7 @@ return [ 'default' => '10000000', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_STORAGE_ANTIVIRUS', @@ -330,6 +364,7 @@ return [ 'default' => 'disabled', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_STORAGE_ANTIVIRUS_HOST', @@ -338,6 +373,7 @@ return [ 'default' => 'clamav', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_STORAGE_ANTIVIRUS_PORT', @@ -346,6 +382,7 @@ return [ 'default' => '3310', 'required' => false, 'question' => '', + 'filter' => '' ], ], ], @@ -360,6 +397,7 @@ return [ 'default' => '900', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_CONTAINERS', @@ -368,6 +406,7 @@ return [ 'default' => '10', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_CPUS', @@ -376,6 +415,7 @@ return [ 'default' => '', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_MEMORY', @@ -384,6 +424,7 @@ return [ 'default' => '256', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_MEMORY_SWAP', @@ -392,6 +433,7 @@ return [ 'default' => '256', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_RUNTIMES', @@ -400,6 +442,7 @@ return [ 'default' => 'node-15.5,deno-1.8,php-8.0,python-3.9,ruby-3.0,dotnet-5.0', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_FUNCTIONS_ENVS', @@ -408,6 +451,7 @@ return [ 'default' => 'node-14.5,deno-1.8,php-7.4,python-3.9,ruby-3.0,dotnet-5.0', 'required' => false, 'question' => '', + 'filter' => '' ], ], [ @@ -421,6 +465,7 @@ return [ 'default' => '86400', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_MAINTENANCE_RETENTION_EXECUTION', @@ -429,6 +474,7 @@ return [ 'default' => '1209600', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT', @@ -437,6 +483,7 @@ return [ 'default' => '1209600', 'required' => false, 'question' => '', + 'filter' => '' ], [ 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE', @@ -445,6 +492,7 @@ return [ 'default' => '86400', 'required' => false, 'question' => '', + 'filter' => '' ] ], ], diff --git a/app/tasks/install.php b/app/tasks/install.php index e2d141f6e4..3cd1c37dda 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -2,6 +2,7 @@ global $cli; +use Appwrite\Auth\Auth; use Appwrite\Docker\Compose; use Appwrite\Docker\Env; use Utopia\Analytics\GoogleAnalytics; @@ -125,6 +126,14 @@ $cli $input = []; foreach($vars as $key => $var) { + if(!empty($var['filter']) && ($interactive !== 'Y' || !Console::isInteractive())) { + $input[$var['name']] = ($data && $var['default'] !== null) + ? $var['default'] + :( $var['filter'] === 'token' + ? Auth::tokenGenerator() + : Auth::passwordGenerator()); + continue; + } if(!$var['required'] || !Console::isInteractive() || $interactive !== 'Y') { $input[$var['name']] = $var['default']; continue; From a2466956ec6b368659ec21ac2627a79baef55ca7 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 12:18:48 +0545 Subject: [PATCH 2/9] fix filter and mysql root password --- app/config/variables.php | 9 +++++++++ app/tasks/install.php | 20 ++++++++++++++------ app/views/install/compose.phtml | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/config/variables.php b/app/config/variables.php index 72b69e2722..334561541b 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -243,6 +243,15 @@ return [ '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' + ], ], ], [ diff --git a/app/tasks/install.php b/app/tasks/install.php index 3cd1c37dda..7becef9d63 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -127,12 +127,20 @@ $cli foreach($vars as $key => $var) { if(!empty($var['filter']) && ($interactive !== 'Y' || !Console::isInteractive())) { - $input[$var['name']] = ($data && $var['default'] !== null) - ? $var['default'] - :( $var['filter'] === 'token' - ? Auth::tokenGenerator() - : Auth::passwordGenerator()); - continue; + if($data && $var['default'] !== null) { + $input[$var['name']] = $var['default']; + continue; + } + + if($var['filter'] === 'token') { + $input[$var['name']] = Auth::tokenGenerator(); + continue; + } + + if($var['filter'] === 'password') { + $input[$var['name']] = Auth::passwordGenerator(); + continue; + } } if(!$var['required'] || !Console::isInteractive() || $interactive !== 'Y') { $input[$var['name']] = $var['default']; diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index fbd89ff2a2..644d7f6e50 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -339,7 +339,7 @@ services: volumes: - appwrite-mariadb:/var/lib/mysql:rw environment: - - MYSQL_ROOT_PASSWORD=rootsecretpassword + - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS} - MYSQL_DATABASE=${_APP_DB_SCHEMA} - MYSQL_USER=${_APP_DB_USER} - MYSQL_PASSWORD=${_APP_DB_PASS} From fd2edd9164719f35db85b80bc227bdca01411c64 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 13:43:01 +0545 Subject: [PATCH 3/9] creating backup of existing file --- app/tasks/install.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/tasks/install.php b/app/tasks/install.php index 7becef9d63..dde394c9e1 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -65,6 +65,8 @@ $cli $data = @file_get_contents($path.'/docker-compose.yml'); if($data !== false) { + Console::info("found old docker-compose.yml file, creating backup docker-compose.yml.backup"); + file_put_contents($path.'/docker-compose.yml.bak',$data); $compose = new Compose($data); $appwrite = $compose->getService('appwrite'); $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null; @@ -90,6 +92,8 @@ $cli $data = @file_get_contents($path.'/.env'); if($data !== false) { // Fetch all env vars from previous .env file + Console::info("found old .env file, creating .env.backup"); + file_put_contents($path.'/.env.bak',$data); $env = new Env($data); foreach ($env->list() as $key => $value) { From 80ded8e77d8054335882501c4977bc269bb548df Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 13:49:51 +0545 Subject: [PATCH 4/9] providing organization and image as param to the installation script and compose file --- app/tasks/install.php | 6 +++++- app/views/install/compose.phtml | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index dde394c9e1..1f210d02fa 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -16,8 +16,10 @@ $cli ->desc('Install Appwrite') ->param('httpPort', '', new Text(4), 'Server HTTP port', true) ->param('httpsPort', '', new Text(4), 'Server HTTPS port', true) + ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true) + ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true) ->param('interactive','Y', new Text(1), 'Run an interactive session', true) - ->action(function ($httpPort, $httpsPort, $interactive) { + ->action(function ($httpPort, $httpsPort, $organization, $image, $interactive) { /** * 1. Start - DONE * 2. Check for older setup and get older version - DONE @@ -165,6 +167,8 @@ $cli ->setParam('httpPort', $httpPort) ->setParam('httpsPort', $httpsPort) ->setParam('version', APP_VERSION_STABLE) + ->setParam('organization',$organization) + ->setParam('image',$image) ; $templateForEnv diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 644d7f6e50..5d945426fb 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -32,7 +32,7 @@ services: - appwrite appwrite: - image: appwrite/appwrite: + image: /: container_name: appwrite restart: unless-stopped networks: @@ -98,7 +98,7 @@ services: - _APP_FUNCTIONS_RUNTIMES appwrite-worker-usage: - image: appwrite/appwrite: + image: /: entrypoint: worker-usage container_name: appwrite-worker-usage restart: unless-stopped @@ -117,7 +117,7 @@ services: - _APP_STATSD_PORT appwrite-worker-audits: - image: appwrite/appwrite: + image: /: entrypoint: worker-audits container_name: appwrite-worker-audits restart: unless-stopped @@ -139,7 +139,7 @@ services: - _APP_DB_PASS appwrite-worker-webhooks: - image: appwrite/appwrite: + image: /: entrypoint: worker-webhooks container_name: appwrite-worker-webhooks restart: unless-stopped @@ -162,7 +162,7 @@ services: - _APP_DB_PASS appwrite-worker-tasks: - image: appwrite/appwrite: + image: /:: entrypoint: worker-tasks container_name: appwrite-worker-tasks restart: unless-stopped @@ -185,7 +185,7 @@ services: - _APP_DB_PASS appwrite-worker-deletes: - image: appwrite/appwrite: + image: /: entrypoint: worker-deletes container_name: appwrite-worker-deletes restart: unless-stopped @@ -211,7 +211,7 @@ services: - _APP_DB_PASS appwrite-worker-certificates: - image: appwrite/appwrite: + image: /: entrypoint: worker-certificates container_name: appwrite-worker-certificates restart: unless-stopped @@ -238,7 +238,7 @@ services: - _APP_DB_PASS appwrite-worker-functions: - image: appwrite/appwrite: + image: /: entrypoint: worker-functions container_name: appwrite-worker-functions restart: unless-stopped @@ -271,7 +271,7 @@ services: - _APP_USAGE_STATS appwrite-worker-mails: - image: appwrite/appwrite: + image: /: entrypoint: worker-mails container_name: appwrite-worker-mails restart: unless-stopped @@ -294,7 +294,7 @@ services: - _APP_SMTP_PASSWORD appwrite-maintenance: - image: appwrite/appwrite: + image: /: entrypoint: maintenance container_name: appwrite-maintenance restart: unless-stopped @@ -315,7 +315,7 @@ services: appwrite-schedule: - image: appwrite/appwrite: + image: /: entrypoint: schedule container_name: appwrite-schedule restart: unless-stopped @@ -331,7 +331,7 @@ services: - _APP_REDIS_PASS mariadb: - image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p + image: /mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite-mariadb restart: unless-stopped networks: @@ -355,7 +355,7 @@ services: - appwrite-redis:/data:rw # clamav: -# image: appwrite/clamav:1.2.0 +# image: /clamav:1.2.0 # container_name: appwrite-clamav # restart: unless-stopped # networks: @@ -373,7 +373,7 @@ services: - appwrite-influxdb:/var/lib/influxdb:rw telegraf: - image: appwrite/telegraf:1.0.0 + image: /telegraf:1.0.0 container_name: appwrite-telegraf restart: unless-stopped networks: From 52e2dc3182f6c1fa22a9892a355c70a1901d321b Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 14:19:19 +0545 Subject: [PATCH 5/9] specify image and org name for main appwrite image --- app/tasks/install.php | 4 ++-- app/views/install/compose.phtml | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index 1f210d02fa..3312e61460 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -68,7 +68,7 @@ $cli if($data !== false) { Console::info("found old docker-compose.yml file, creating backup docker-compose.yml.backup"); - file_put_contents($path.'/docker-compose.yml.bak',$data); + file_put_contents($path.'/docker-compose.yml.backup',$data); $compose = new Compose($data); $appwrite = $compose->getService('appwrite'); $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null; @@ -95,7 +95,7 @@ $cli if($data !== false) { // Fetch all env vars from previous .env file Console::info("found old .env file, creating .env.backup"); - file_put_contents($path.'/.env.bak',$data); + file_put_contents($path.'/.env.backup',$data); $env = new Env($data); foreach ($env->list() as $key => $value) { diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 5d945426fb..8edc1e4bfe 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -3,6 +3,8 @@ $httpPort = $this->getParam('httpPort', ''); $httpsPort = $this->getParam('httpsPort', ''); $version = $this->getParam('version', ''); +$organization = $this->getParam('organization', ''); +$image = $this->getParam('image', ''); ?>version: '3' services: @@ -162,7 +164,7 @@ services: - _APP_DB_PASS appwrite-worker-tasks: - image: /:: + image: /: entrypoint: worker-tasks container_name: appwrite-worker-tasks restart: unless-stopped @@ -331,7 +333,7 @@ services: - _APP_REDIS_PASS mariadb: - image: /mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p + image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite-mariadb restart: unless-stopped networks: @@ -355,7 +357,7 @@ services: - appwrite-redis:/data:rw # clamav: -# image: /clamav:1.2.0 +# image: appwrite/clamav:1.2.0 # container_name: appwrite-clamav # restart: unless-stopped # networks: @@ -373,7 +375,7 @@ services: - appwrite-influxdb:/var/lib/influxdb:rw telegraf: - image: /telegraf:1.0.0 + image: appwrite/telegraf:1.0.0 container_name: appwrite-telegraf restart: unless-stopped networks: From 6bb46a676d02ff35467f7a7c22ae2a11a1815baf Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 May 2021 14:21:22 +0545 Subject: [PATCH 6/9] multiple backups of old files --- app/tasks/install.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index 3312e61460..d1b45a4484 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -67,8 +67,9 @@ $cli $data = @file_get_contents($path.'/docker-compose.yml'); if($data !== false) { - Console::info("found old docker-compose.yml file, creating backup docker-compose.yml.backup"); - file_put_contents($path.'/docker-compose.yml.backup',$data); + $time = \time(); + Console::info('found old docker-compose.yml file, creating backup docker-compose.yml.'.$time.'.backup'); + file_put_contents($path.'/docker-compose.yml.'.$time.'.backup',$data); $compose = new Compose($data); $appwrite = $compose->getService('appwrite'); $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null; @@ -94,8 +95,8 @@ $cli $data = @file_get_contents($path.'/.env'); if($data !== false) { // Fetch all env vars from previous .env file - Console::info("found old .env file, creating .env.backup"); - file_put_contents($path.'/.env.backup',$data); + Console::info('found old .env file, creating backup .env.'.$time.'.backup'); + file_put_contents($path.'/.env.'.$time.'.backup',$data); $env = new Env($data); foreach ($env->list() as $key => $value) { From 8ec0c666e42fd23f1f48bffe1a9029579a20cc6b Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 18 May 2021 22:29:44 +0300 Subject: [PATCH 7/9] Update app/tasks/install.php --- app/tasks/install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index d1b45a4484..8a0be7b06d 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -168,8 +168,8 @@ $cli ->setParam('httpPort', $httpPort) ->setParam('httpsPort', $httpsPort) ->setParam('version', APP_VERSION_STABLE) - ->setParam('organization',$organization) - ->setParam('image',$image) + ->setParam('organization', $organization) + ->setParam('image', $image) ; $templateForEnv From 5185321566f6a9941633bba5dd94aa26fb6d10bd Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 18 May 2021 22:30:09 +0300 Subject: [PATCH 8/9] Update app/tasks/install.php --- app/tasks/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index 8a0be7b06d..834576389d 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -68,7 +68,7 @@ $cli if($data !== false) { $time = \time(); - Console::info('found old docker-compose.yml file, creating backup docker-compose.yml.'.$time.'.backup'); + Console::info('Compose file found, creating backup: docker-compose.yml.'.$time.'.backup'); file_put_contents($path.'/docker-compose.yml.'.$time.'.backup',$data); $compose = new Compose($data); $appwrite = $compose->getService('appwrite'); From a0daea0bb97ab4bbc483acb374d7c816983da54a Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 18 May 2021 22:30:17 +0300 Subject: [PATCH 9/9] Update app/tasks/install.php --- app/tasks/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/install.php b/app/tasks/install.php index 834576389d..755e0b7e2c 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -95,7 +95,7 @@ $cli $data = @file_get_contents($path.'/.env'); if($data !== false) { // Fetch all env vars from previous .env file - Console::info('found old .env file, creating backup .env.'.$time.'.backup'); + Console::info('Env file found, creating backup: .env.'.$time.'.backup'); file_put_contents($path.'/.env.'.$time.'.backup',$data); $env = new Env($data);