From: Dan Brown <redacted>
Date: Sun, 23 Apr 2023 14:05:13 +0000 (+0100)
Subject: Merge branch 'feature/mail-verify-peer' into development
X-Git-Tag: v23.05~1^2~18
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/58cadce052f5cc3c9ce2bc12f88a93cac310699a?ds=inline;hp=-c

Merge branch 'feature/mail-verify-peer' into development
---

58cadce052f5cc3c9ce2bc12f88a93cac310699a
diff --combined .env.example.complete
index f46bfccc0,9ce33f58f..7071846a3
--- a/.env.example.complete
+++ b/.env.example.complete
@@@ -3,10 -3,6 +3,10 @@@
  # Each option is shown with it's default value.
  # Do not copy this whole file to use as your '.env' file.
  
 +# The details here only serve as a quick reference.
 +# Please refer to the BookStack documentation for full details:
 +# https://www.bookstackapp.com/docs/
 +
  # Application environment
  # Can be 'production', 'development', 'testing' or 'demo'
  APP_ENV=production
@@@ -83,6 -79,7 +83,7 @@@ MAIL_PORT=102
  MAIL_USERNAME=null
  MAIL_PASSWORD=null
  MAIL_ENCRYPTION=null
+ MAIL_VERIFY_SSL=true
  
  # Command to use when email is sent via sendmail
  MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
@@@ -326,13 -323,6 +327,13 @@@ FILE_UPLOAD_SIZE_LIMIT=5
  # Can be 'a4' or 'letter'.
  EXPORT_PAGE_SIZE=a4
  
 +# Set path to wkhtmltopdf binary for PDF generation.
 +# Can be 'false' or a path path like: '/home/bins/wkhtmltopdf'
 +# When false, BookStack will attempt to find a wkhtmltopdf in the application
 +# root folder then fall back to the default dompdf renderer if no binary exists.
 +# Only used if 'ALLOW_UNTRUSTED_SERVER_FETCHING=true' which disables security protections.
 +WKHTMLTOPDF=false
 +
  # Allow <script> tags in page content
  # Note, if set to 'true' the page editor may still escape scripts.
  ALLOW_CONTENT_SCRIPTS=false
@@@ -383,4 -373,4 +384,4 @@@ LOG_FAILED_LOGIN_CHANNEL=errorlog_plain
  # IP address '146.191.42.4' would result in '146.191.x.x' being logged.
  # For the IPv6 address '2001:db8:85a3:8d3:1319:8a2e:370:7348' this would result as:
  # '2001:db8:85a3:8d3:x:x:x:x'
- IP_ADDRESS_PRECISION=4
+ IP_ADDRESS_PRECISION=4