From 19fe6e2423b98bbf3ce56cc0d8bc9526761f56a5 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 6 Jun 2023 18:37:21 +0200 Subject: [PATCH 1/3] fix: normalize nginx bash the line endings --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..31ac0a937 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +docker/nginx/build-nginx.sh text eol=lf \ No newline at end of file From e24b23ce7e7796667b02eccd8f215cec5fa9865c Mon Sep 17 00:00:00 2001 From: ElforJani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 6 Jun 2023 19:49:25 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20FIX:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 31ac0a937..282599f38 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -docker/nginx/build-nginx.sh text eol=lf \ No newline at end of file +docker/nginx/scripts/build-nginx.sh text eol=lf \ No newline at end of file From 4ed9c36ebd9bab0f465f2ea3566bec0867028d7b Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 6 Jun 2023 20:37:42 +0200 Subject: [PATCH 3/3] feat: set default value to env vars --- .env.example | 31 ++++++++++++++++++------------- .gitattributes | 3 ++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index 94c47d06e..b7754cd88 100644 --- a/.env.example +++ b/.env.example @@ -8,27 +8,32 @@ MAIL_FROM_NAME= MAIL_FROM_ADDRESS= # Database -DB_HOST= -DB_USER= -DB_PASSWORD= -DB_ROOT_PASSWORD= -DB_CHARSET= +DB_HOST=mysql +DB_USER=bigcapital +DB_PASSWORD=bigcapital +DB_ROOT_PASSWORD=root +DB_CHARSET=utf-8 # System database SYSTEM_DB_NAME=bigcapital_system +# SYSTEM_DB_USER= +# SYSTEM_DB_PASSWORD= +# SYSTEM_DB_NAME= +# SYSTEM_DB_CHARSET= -# Tenants databases +# Tenant databases TENANT_DB_NAME_PERFIX=bigcapital_tenant_ - -# MongoDB -MONGODB_DATABASE_URL=mongodb://localhost/bigcapital - -# Authentication -JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI +# TENANT_DB_HOST= +# TENANT_DB_USER= +# TENANT_DB_PASSWORD= +# TENANT_DB_CHARSET= # Application BASE_URL=https://bigcapital.ly -CONTACT_US_MAIL=support@bigcapital.ly +JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI + +# Jobs MongoDB +MONGODB_DATABASE_URL=mongodb://localhost/bigcapital # App proxy PUBLIC_PROXY_PORT=80 diff --git a/.gitattributes b/.gitattributes index 282599f38..649fa30ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -docker/nginx/scripts/build-nginx.sh text eol=lf \ No newline at end of file +docker/nginx/scripts/build-nginx.sh text eol=lf +docker/mariadb/docker-entrypoint.sh text eol=lf \ No newline at end of file