Updated issue template and added TinyMCE autolinking

[bookstack] / config / services.php

diff --git a/config/services.php b/config/services.php
index 45603c99a7a4cbf97364af47ad44659b904136a2..d71ff4a26d27a8987f11835e4472dc82c96865df 100644 (file)
--- a/config/services.php
+++ b/config/services.php
@@ -13,8 +13,10 @@ return [
     | to have a conventional place to find your various credentials.
     |
     */
     | to have a conventional place to find your various credentials.
     |
     */

+    'disable_services' => env('DISABLE_EXTERNAL_SERVICES', false),
+    'callback_url' => env('APP_URL', false),

 
 

-    'mailgun' => [
+    'mailgun'  => [

         'domain' => '',
         'secret' => '',
     ],
         'domain' => '',
         'secret' => '',
     ],


@@ -23,16 +25,37 @@ return [
         'secret' => '',
     ],
 
         'secret' => '',
     ],
 

-    'ses' => [
+    'ses'      => [

         'key'    => '',
         'secret' => '',
         'region' => 'us-east-1',
     ],
 
         'key'    => '',
         'secret' => '',
         'region' => 'us-east-1',
     ],
 

-    'stripe' => [
-        'model'  => Oxbow\User::class,
+    'stripe'   => [
+        'model'  => BookStack\User::class,

         'key'    => '',
         'secret' => '',
     ],
 
         'key'    => '',
         'secret' => '',
     ],
 

+    'github'   => [
+        'client_id'     => env('GITHUB_APP_ID', false),
+        'client_secret' => env('GITHUB_APP_SECRET', false),
+        'redirect'      => env('APP_URL') . '/login/service/github/callback',
+    ],
+
+    'google'   => [
+        'client_id'     => env('GOOGLE_APP_ID', false),
+        'client_secret' => env('GOOGLE_APP_SECRET', false),
+        'redirect'      => env('APP_URL') . '/login/service/google/callback',
+    ],
+
+    'ldap' => [
+        'server' => env('LDAP_SERVER', false),
+        'dn' => env('LDAP_DN', false),
+        'pass' => env('LDAP_PASS', false),
+        'base_dn' => env('LDAP_BASE_DN', false),
+        'user_filter' => env('LDAP_USER_FILTER', '(&(uid=${user}))'),
+        'version' => env('LDAP_VERSION', false)
+    ]
+

 ];
 ];