From: Dan Brown <redacted>
Date: Tue, 28 Jul 2020 09:46:40 +0000 (+0100)
Subject: Merge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth
X-Git-Tag: v0.30.0~1^2~4^2~12
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2f6ff0734773c4ac009de699a2661971fd585b22

Merge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth
---

2f6ff0734773c4ac009de699a2661971fd585b22
diff --cc app/Config/logging.php
index 375e84083,406b9f2f9..ba77ba81e
--- a/app/Config/logging.php
+++ b/app/Config/logging.php
@@@ -77,13 -77,11 +77,18 @@@ return 
              'driver' => 'monolog',
              'handler' => NullHandler::class,
          ],
 +
 +        // Testing channel
 +        // Uses a shared testing instance during tests
 +        // so that logs can be checked against.
 +        'testing' => [
 +            'driver' => 'testing',
 +        ],
      ],
  
+     // Failed Access Message
+     // Defines the message to log into webserver logs in case of failed access,
+     // for further processing by tools like Fail2Ban.
+     'failed_access_message' => env('FAILED_ACCESS_MESSAGE', ''),
+ 
  ];