From 6a7f0b9c8fd81a70cf18f35043b6c0eb5c677022 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 27 Sep 2020 17:29:06 +0300 Subject: [PATCH] Added missing env vars --- .env | 5 +++- app/views/install/compose.phtml | 8 ++++++ app/workers/certificates.php | 2 +- docker-compose.yml | 45 ++++++++++++++++++++------------- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.env b/.env index f8777509a..f1346302e 100644 --- a/.env +++ b/.env @@ -1,5 +1,8 @@ _APP_ENV=production _APP_ENV=development +_APP_SYSTEM_EMAIL_NAME=Appwrite +_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io +_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io _APP_OPTIONS_ABUSE=disabled _APP_OPTIONS_FORCE_HTTPS=disabled _APP_OPENSSL_KEY_V1=your-secret-key @@ -16,7 +19,7 @@ _APP_INFLUXDB_HOST=influxdb _APP_INFLUXDB_PORT=8086 _APP_STATSD_HOST=telegraf _APP_STATSD_PORT=8125 -_APP_SMTP_HOST=maildev +_APP_SMTP_HOST=smtp _APP_SMTP_PORT=25 _APP_STORAGE_LIMIT=100000000 _APP_FUNCTIONS_TIMEOUT=900 diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 7df932c9e..66583c380 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -52,6 +52,9 @@ services: - influxdb environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_OPTIONS_ABUSE - _APP_OPTIONS_FORCE_HTTPS - _APP_OPENSSL_KEY_V1 @@ -119,6 +122,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -139,6 +143,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -185,6 +190,7 @@ services: - appwrite-certificates:/storage/certificates:rw environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -231,6 +237,8 @@ services: - smtp environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_SMTP_HOST diff --git a/app/workers/certificates.php b/app/workers/certificates.php index 4b81a9ea9..421bd5701 100644 --- a/app/workers/certificates.php +++ b/app/workers/certificates.php @@ -115,7 +115,7 @@ class CertificatesV1 $staging = (App::isProduction()) ? '' : ' --dry-run'; $response = \shell_exec("certbot certonly --webroot --noninteractive --agree-tos{$staging} \ - --email ".App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', 'security@localhost.test')." \ + --email ".App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', 'security@localhost.test')." \ -w ".APP_STORAGE_CERTIFICATES." \ -d {$domain->get()}"); diff --git a/docker-compose.yml b/docker-compose.yml index 132fe9f2c..48020fef5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,6 +66,9 @@ services: - influxdb environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_OPTIONS_ABUSE - _APP_OPTIONS_FORCE_HTTPS - _APP_OPENSSL_KEY_V1 @@ -136,6 +139,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -157,6 +161,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -205,6 +210,7 @@ services: - appwrite-certificates:/storage/certificates:rw environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -250,10 +256,12 @@ services: - appwrite depends_on: - redis - - maildev - # - smtp + # - maildev + - smtp environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_SMTP_HOST @@ -290,25 +298,28 @@ services: - MYSQL_USER=user - MYSQL_PASSWORD=password command: 'mysqld --innodb-flush-method=fsync' + # command: mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu - maildev: - image: djfarrelly/maildev - container_name: appwrite-maildev - restart: unless-stopped - ports: - - '1080:80' - networks: - - appwrite - - # smtp: - # image: appwrite/smtp:1.0.1 - # container_name: appwrite-smtp + # maildev: + # image: djfarrelly/maildev + # container_name: appwrite-maildev # restart: unless-stopped + # ports: + # - '1080:80' # networks: # - appwrite - # environment: - # - MAILNAME=appwrite - # - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 + + smtp: + image: appwrite/smtp:1.2.0 + container_name: appwrite-smtp + restart: unless-stopped + networks: + - appwrite + environment: + - LOCAL_DOMAINS=@ + - RELAY_FROM_HOSTS=192.168.0.0/16 ; *.yourdomain.com + - SMARTHOST_HOST=smtp + - SMARTHOST_PORT=587 redis: image: redis:5.0