CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-30 09:18:14 +13:00
Code Issues Projects Releases Wiki Activity

Merge pull request #563 from appwrite/bug-0-missing-env-vars

Browse source 
Bug: missing env vars
This commit is contained in:
Eldad A. Fux 2020-09-27 17:32:53 +03:00 committed by GitHub
commit 9f39f8325f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env
View file

@ -1,5 +1,8 @@
_APP_ENV=production _APP_ENV=production
_APP_ENV=development _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_ABUSE=disabled
_APP_OPTIONS_FORCE_HTTPS=disabled _APP_OPTIONS_FORCE_HTTPS=disabled
_APP_OPENSSL_KEY_V1=your-secret-key _APP_OPENSSL_KEY_V1=your-secret-key

8
app/views/install/compose.phtml
View file

@ -52,6 +52,9 @@ services:
- influxdb - influxdb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_EMAIL_NAME
- _APP_SYSTEM_EMAIL_ADDRESS
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_OPTIONS_ABUSE - _APP_OPTIONS_ABUSE
- _APP_OPTIONS_FORCE_HTTPS - _APP_OPTIONS_FORCE_HTTPS
- _APP_OPENSSL_KEY_V1 - _APP_OPENSSL_KEY_V1
@ -119,6 +122,7 @@ services:
- mariadb - mariadb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -139,6 +143,7 @@ services:
- mariadb - mariadb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -185,6 +190,7 @@ services:
- appwrite-certificates:/storage/certificates:rw - appwrite-certificates:/storage/certificates:rw
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -231,6 +237,8 @@ services:
- smtp - smtp
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_EMAIL_NAME
- _APP_SYSTEM_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_SMTP_HOST - _APP_SMTP_HOST

2
app/workers/certificates.php
View file

@ -115,7 +115,7 @@ class CertificatesV1
$staging = (App::isProduction()) ? '' : ' --dry-run'; $staging = (App::isProduction()) ? '' : ' --dry-run';
$response = \shell_exec("certbot certonly --webroot --noninteractive --agree-tos{$staging} \ $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." \ -w ".APP_STORAGE_CERTIFICATES." \
-d {$domain->get()}"); -d {$domain->get()}");

17
docker-compose.yml
View file

@ -66,6 +66,9 @@ services:
- influxdb - influxdb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_EMAIL_NAME
- _APP_SYSTEM_EMAIL_ADDRESS
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_OPTIONS_ABUSE - _APP_OPTIONS_ABUSE
- _APP_OPTIONS_FORCE_HTTPS - _APP_OPTIONS_FORCE_HTTPS
- _APP_OPENSSL_KEY_V1 - _APP_OPENSSL_KEY_V1
@ -136,6 +139,7 @@ services:
- mariadb - mariadb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -157,6 +161,7 @@ services:
- mariadb - mariadb
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -205,6 +210,7 @@ services:
- appwrite-certificates:/storage/certificates:rw - appwrite-certificates:/storage/certificates:rw
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_DB_HOST - _APP_DB_HOST
@ -254,6 +260,8 @@ services:
# - smtp # - smtp
environment: environment:
- _APP_ENV - _APP_ENV
- _APP_SYSTEM_EMAIL_NAME
- _APP_SYSTEM_EMAIL_ADDRESS
- _APP_REDIS_HOST - _APP_REDIS_HOST
- _APP_REDIS_PORT - _APP_REDIS_PORT
- _APP_SMTP_HOST - _APP_SMTP_HOST
@ -290,6 +298,7 @@ services:
- MYSQL_USER=user - MYSQL_USER=user
- MYSQL_PASSWORD=password - MYSQL_PASSWORD=password
command: 'mysqld --innodb-flush-method=fsync' command: 'mysqld --innodb-flush-method=fsync'
# command: mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
maildev: maildev:
image: djfarrelly/maildev image: djfarrelly/maildev
@ -301,14 +310,16 @@ services:
- appwrite - appwrite
# smtp: # smtp:
# image: appwrite/smtp:1.0.1 # image: appwrite/smtp:1.2.0
# container_name: appwrite-smtp # container_name: appwrite-smtp
# restart: unless-stopped # restart: unless-stopped
# networks: # networks:
# - appwrite # - appwrite
# environment: # environment:
# - MAILNAME=appwrite # - LOCAL_DOMAINS=@
# - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 # - RELAY_FROM_HOSTS=192.168.0.0/16 ; *.yourdomain.com
# - SMARTHOST_HOST=smtp
# - SMARTHOST_PORT=587
redis: redis:
image: redis:5.0 image: redis:5.0