Expand config for redis.

.env.example

@@ -60,6 +60,12 @@ PGSQL_SSL_CRL_FILE=null
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# If you set either of these to 'redis', you might want to update these settings too
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+REDIS_DB="0" # always use quotes
+
 # You can configure another file storage backend if you cannot use the local storage option.
 # To set this up, fill in the following variables. The upload path is used to store uploaded
 # files and the export path is to store exported data (before download).
@@ -171,9 +177,6 @@ APP_NAME=FireflyIII
 ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
 CACHE_PREFIX=firefly
 SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=

composer.json

@@ -61,9 +61,10 @@
     "ext-fileinfo": "*",
     "ext-gd": "*",
     "ext-intl": "*",
-    "ext-session": "*",
     "ext-json": "*",
     "ext-openssl": "*",
+    "ext-pdo": "*",
+    "ext-session": "*",
     "ext-simplexml": "*",
     "ext-tokenizer": "*",
     "ext-xml": "*",
@@ -74,6 +75,7 @@
     "davejamesmiller/laravel-breadcrumbs": "5.*",
     "doctrine/dbal": "2.*",
     "fideloper/proxy": "4.*",
+    "jc5/google2fa-laravel": "2.*",
     "laravel/framework": "5.8.*",
     "laravel/passport": "7.*",
     "laravelcollective/html": "5.8.*",
@@ -85,10 +87,9 @@
     "litipk/flysystem-fallback-adapter": "0.*",
     "mschindler83/fints-hbci-php": "1.*",
     "pragmarx/google2fa": "6.1.3",
-    "pragmarx/google2fa-laravel": "1.*",
     "pragmarx/recovery": "^0.1.0",
-    "rcrowe/twigbridge": "0.9.*",
-    "ext-pdo": "*"
+    "predis/predis": "^1.1",
+    "rcrowe/twigbridge": "0.9.*"
   },
   "require-dev": {
     "barryvdh/laravel-ide-helper": "2.*",

config/database.php

@@ -96,7 +96,7 @@ return [
             'host'     => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port'     => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'database' => env('REDIS_DB', '0'),
         ],
 
     ],

config/google2fa.php

@@ -91,4 +91,7 @@ return [
      */
     'throw_exceptions' => true,
 
+
+    'store_in_cookie' => true,
+
 ];