feat: update laravel-cloudflare (#5904)

monicahq · Jan 15, 2022 · 458642a · 458642a
1 parent 519efc2
commit 458642a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 130 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -50,7 +50,7 @@ protected function schedule(Schedule $schedule)
         $this->scheduleCommand($schedule, 'monica:ping', 'daily');
         $this->scheduleCommand($schedule, 'monica:clean', 'daily');
         $this->scheduleCommand($schedule, 'monica:updategravatars', 'weekly');
-        if (config('trustedproxy.cloudflare')) {
+        if (config('monica.cloudflare')) {
             $this->scheduleCommand($schedule, 'cloudflare:reload', 'daily');
         }
         $this->scheduleCommand($schedule, 'model:prune', 'daily');

diff --git a/composer.json b/composer.json
@@ -22,7 +22,6 @@
         "doctrine/dbal": "^3.0",
         "erusev/parsedown": "^1.7",
         "facade/ignition": "^2.0",
-        "fideloper/proxy": "^4.0",
         "giggsey/libphonenumber-for-php": "^8.9",
         "guzzlehttp/guzzle": "^7.2",
         "intervention/image": "^2.3",
@@ -37,7 +36,7 @@
         "mariuzzo/laravel-js-localization": "^1.7",
         "matriphe/iso-639": "^1.0",
         "moneyphp/money": "^3.1",
-        "monicahq/laravel-cloudflare": "^1.0",
+        "monicahq/laravel-cloudflare": "^3.0",
         "monicahq/laravel-sabre": "^1.2",
         "ok/ipstack-client": "^1.2",
         "phar-io/version": "^3.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/monica.php b/config/monica.php
@@ -284,4 +284,12 @@
     */
     'export_size' => (int) env('EXPORT_SIZE', 5),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Enable cloudflare trusted proxies
+    |--------------------------------------------------------------------------
+    |
+    */
+    'cloudflare' => (bool) env('APP_TRUSTED_CLOUDFLARE', false),
+
 ];
diff --git a/config/trustedproxy.php b/config/trustedproxy.php