wip #5851

diff --git a/.docker/config/cron/host b/.docker/config/cron/host
index 979810b616fe354bcf4862abd68fb8eb62b614b7..973efaa073c6138641145b6447c1181ee7ba6741 100644 (file)
--- a/.docker/config/cron/host
+++ b/.docker/config/cron/host
@@ -1 +1,2 @@
 3 4 * * *   root    /docker/fluidbook-toolbox/build  >/dev/null 2>/dev/null
+3 5 * * *   root    /docker/fluidbook-toolbox-dev/build  >/dev/null 2>/dev/null

diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile
index a25b4db83268f18447951826282f665b9ae3b2d0..b99ac1993dd087aeb3e032b21c71e12555023cd4 100644 (file)
--- a/.docker/images/php-dev/Dockerfile
+++ b/.docker/images/php-dev/Dockerfile
@@ -1,7 +1,3 @@
-############################################
-# PHPDocker.io PHP 8.1 / CLI and FPM image #
-############################################
-
 FROM ubuntu:latest AS cli
 
 WORKDIR "/application"

diff --git a/.docker/images/php-dev/startup b/.docker/images/php-dev/startup
index 494a93bd6c88f1809955c89396bb4a3f948ccc68..3dc58488c8eaa449cf0efb9b56c9ab25b3ae922b 100644 (file)
--- a/.docker/images/php-dev/startup
+++ b/.docker/images/php-dev/startup
@@ -36,4 +36,4 @@ chmod -R 700 /etc/monit;chown -R root:root /etc/monit;/usr/bin/monit
 chown -R root:root /etc/monit && /usr/bin/monit
 
 # Launch PHP
-/usr/sbin/php-fpm8.1 -O
+/usr/sbin/php-fpm8.2 -O

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 8176b37675de2ed0c813dfd0df43cf756d02035c..e3f1e496ea6e8c3e7f528df44fcbe961f12c7dc0 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -29,7 +29,7 @@ class Kernel extends \Cubist\Backpack\Console\Kernel
         // $schedule->command('backup:clean')->daily()->at('04:00');
         // $schedule->command('backup:run')->daily()->at('05:00');
 
-        if (config('env') !== 'production') {
+        if (config('env') === 'production') {
             $schedule->command('job:dispatchNow Maintenance\\\\CleanDownloads')->dailyAt('4:00');
             $schedule->command('job:dispatchNow Maintenance\\\\CleanFTP')->dailyAt('4:30');
             $schedule->command('ws:migrate --publications=v2 --documents=missing')->dailyAt('1:00');

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index ee5b5958ed929c04c17a0df6ea61a56cbf0da5a5..ce930a200b74ff0e726aca36923f3930c97b2785 100644 (file)
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

diff --git a/auth.json b/auth.json
new file mode 100644 (file)
index 0000000..54bf14a
--- /dev/null
+++ b/auth.json
@@ -0,0 +1,8 @@
+{
+    "http-basic": {
+        "backpackforlaravel.com": {
+            "username": "cubedesigners23627297",
+            "password": "m4iLNaqzuFer"
+        }
+    }
+}