From d0f189203837a880ed27d48e6208ea6108282891 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sun, 11 Apr 2021 19:15:09 +0200 Subject: [PATCH] Use new config file and add abra.sh --- .env.sample | 50 +++++++++++++++++++++++++++++++++++++++++++++++ .envrc.sample | 54 --------------------------------------------------- abra.sh | 3 +++ 3 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 .env.sample delete mode 100644 .envrc.sample create mode 100644 abra.sh diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..380d86f --- /dev/null +++ b/.env.sample @@ -0,0 +1,50 @@ +APP=foodsoft + +DOMAIN=order.biobulkbende.org +LETS_ENCRYPT_ENV=production + +FOODCOOP_NAME=biobulkbende +FOODCOOP_CITY=Rotterdam +FOODCOOP_COUNTRY=The Netherlands +FOODCOOP_EMAIL=info@biobulkbende.org +FOODCOOP_PHONE="+31684233964" +FOODCOOP_STREET="Almondestraat 157" +FOODCOOP_ZIP_CODE=3032CD +FOODCOOP_HOMEPAGE=https://order.biobulkbende.org +FOODCOOP_HELP_URL=https://order.biobulkbende.org +FOODCOOP_TIME_ZONE=Amsterdam +FOODCOOP_FOOTER="Biobulkbende hosted by Autonomic Cooperative." + +MYSQL_DB=foodsoft +MYSQL_HOST=db +MYSQL_PORT=3306 +MYSQL_USER=foodsoft + +EMAIL_SENDER=foodsoft@biobulkbende.org +EMAIL_REPLY=foodsoft@biobulkbende.org +ERROR_EMAIL=systems@biobulkbende.org + +# COMPOSE_FILE="compose.yml:compose.sharedlists.yml" +ENABLE_SHARED_LISTS=0 +SHARED_LISTS_DB_TYPE=mysql2 +SHARED_LISTS_HOST=order.voedselcollectief.org +SHARED_LISTS_DB_NAME=sharedlists +SHARED_LISTS_USER=biobulkbende + +SMTP_ADDRESS=foodsoft@biobulkbende.org +SMTP_AUTHENTICATION=plain +SMTP_DOMAIN=mail.autonomic.zone +SMTP_ENABLE_STARTTLS_AUTO=true +SMTP_PORT=587 +SMTP_USER_NAME=foodsoft + +FOODSOFT_SMTP_ENABLED=1 + +SMTP_SERVER_PORT=2525 +SMTP_SERVER_HOST=0.0.0.0 + +SECRET_DB_PASSWORD_VERSION=v1 +SECRET_DB_ROOT_PASSWORD_VERSION=v1 +SECRET_SHARED_LISTS_DB_PASSWORD_VERSION=v1 +SECRET_SMTP_PASSWORD_VERSION=v1 +SECRET_SECRET_KEY_BASE_VERSION=v1 # length=30 diff --git a/.envrc.sample b/.envrc.sample deleted file mode 100644 index 4b76a71..0000000 --- a/.envrc.sample +++ /dev/null @@ -1,54 +0,0 @@ -export APP=foodsoft - -export DOMAIN=order.biobulkbende.org -export LETS_ENCRYPT_ENV=production - -export FOODCOOP_NAME=biobulkbende -export FOODCOOP_CITY=Rotterdam -export FOODCOOP_COUNTRY=The Netherlands -export FOODCOOP_EMAIL=info@biobulkbende.org -export FOODCOOP_PHONE="+31684233964" -export FOODCOOP_STREET="Almondestraat 157" -export FOODCOOP_ZIP_CODE=3032CD -export FOODCOOP_HOMEPAGE=https://order.biobulkbende.org -export FOODCOOP_HELP_URL=https://order.biobulkbende.org -export FOODCOOP_TIME_ZONE=Amsterdam -export FOODCOOP_FOOTER="Biobulkbende hosted by Autonomic Cooperative." - -export MYSQL_DB=foodsoft -export MYSQL_HOST=db -export MYSQL_PORT=3306 -export MYSQL_USER=foodsoft - -export EMAIL_SENDER=foodsoft@biobulkbende.org -export EMAIL_REPLY=foodsoft@biobulkbende.org -export ERROR_EMAIL=systems@biobulkbende.org - -# export COMPOSE_FILE="compose.yml:compose.sharedlists.yml" -export ENABLE_SHARED_LISTS=0 -export SHARED_LISTS_DB_TYPE=mysql2 -export SHARED_LISTS_HOST=order.voedselcollectief.org -export SHARED_LISTS_DB_NAME=sharedlists -export SHARED_LISTS_USER=biobulkbende - -export SMTP_ADDRESS=foodsoft@biobulkbende.org -export SMTP_AUTHENTICATION=plain -export SMTP_DOMAIN=mail.autonomic.zone -export SMTP_ENABLE_STARTTLS_AUTO=true -export SMTP_PORT=587 -export SMTP_USER_NAME=foodsoft - -export FOODSOFT_SMTP_ENABLED=1 - -export SMTP_SERVER_PORT=2525 -export SMTP_SERVER_HOST=0.0.0.0 - -export SECRET_DB_PASSWORD_VERSION=v1 -export SECRET_DB_ROOT_PASSWORD_VERSION=v1 -export SECRET_SHARED_LISTS_DB_PASSWORD_VERSION=v1 -export SECRET_SMTP_PASSWORD_VERSION=v1 -export SECRET_SECRET_KEY_BASE_VERSION=v1 # length=30 - -export APP_CONFIG_VERSION=v1 -export DB_CONFIG_VERSION=v1 -export ENTRYPOINT_VERSION=v1 diff --git a/abra.sh b/abra.sh new file mode 100644 index 0000000..52a9a89 --- /dev/null +++ b/abra.sh @@ -0,0 +1,3 @@ +export APP_CONFIG_VERSION=v1 +export DB_CONFIG_VERSION=v1 +export ENTRYPOINT_VERSION=v1