From: Dan Brown <redacted>
Date: Wed, 29 Sep 2021 17:13:38 +0000 (+0100)
Subject: Merge branch 'floviolleau-db-prefixes' of https://github.com/floviolleau/BookStack... 
X-Git-Tag: v21.08.4~1^2~5
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0f66c8a0ccc5d87bc691bc42024da5caec3b5e0f?ds=inline;hp=-c

Merge branch 'floviolleau-db-prefixes' of https://github.com/floviolleau/BookStack into floviolleau-floviolleau-db-prefixes
---

0f66c8a0ccc5d87bc691bc42024da5caec3b5e0f
diff --combined .env.example.complete
index 5eb65c27f,970ec16d9..e28fedad9
--- a/.env.example.complete
+++ b/.env.example.complete
@@@ -42,19 -42,12 +42,20 @@@ APP_TIMEZONE=UT
  # overrides can be made. Defaults to disabled.
  APP_THEME=false
  
 +# Trusted Proxies
 +# Used to indicate trust of systems that proxy to the application so
 +# certain header values (Such as "X-Forwarded-For") can be used from the
 +# incoming proxy request to provide origin detail.
 +# Set to an IP address, or multiple comma seperated IP addresses.
 +# Can alternatively be set to "*" to trust all proxy addresses.
 +APP_PROXIES=null
 +
  # Database details
  # Host can contain a port (localhost:3306) or a separate DB_PORT option can be used.
  DB_HOST=localhost
  DB_PORT=3306
  DB_DATABASE=database_database
+ DB_TABLE_PREFIX=
  DB_USERNAME=database_username
  DB_PASSWORD=database_user_password