wip #5851

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index c6b62654d901e4b8a68c20fd9d13ed46b1ade923..382c1d2a98d757c83f11eb2a98cc7f0f4085494e 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -10,8 +10,8 @@ services:
       # Files
       - '/home/extranet/share:/application/share'
       - '/home/toolbox/dev:/application'
-      - '/data/toolbox/storage/app/public/:/application/public/storage/'
-      - '/data/toolbox/storage/:/application/storage/'
+      - '/data/toolbox/dev/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
@@ -74,12 +74,12 @@ services:
       # PHP
       - '/home/toolbox/dev/.docker/config/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
       # ENV
-      - '/home/toolbox/www/.env.dev:/application/.env'
+      - '/home/toolbox/dev/.env.dev:/application/.env'
       # Files
       - '/home/extranet/share:/application/share'
       - '/home/toolbox/dev:/application'
-      - '/data/toolbox/storage/app/public/:/application/public/storage/'
-      - '/data/toolbox/storage/:/application/storage/'
+      - '/data/toolbox/dev/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'

diff --git a/.env.dev b/.env.dev
index edb11b44f9522d102d4c710c9e93316923bf5e77..32d41d081060de17e393f3d621809e46bda69324 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -2,7 +2,7 @@ APP_NAME="[DEV] Fluidbook Toolbox"
 APP_ENV=development
 APP_KEY=base64:DRIdIwSEuQNkxuUTfyyRyssizosh3D9QHWTnobrW44U=
 APP_DEBUG=true
-DEBUGBAR_ENABLED=true
+DEBUGBAR_ENABLED=false
 
 APP_URL=https://dev.toolbox.fluidbook.com
 
@@ -26,6 +26,7 @@ QUEUE_CONNECTION=database
 
 SESSION_DRIVER=redis
 SESSION_LIFETIME=1200
+SESSION_DOMAIN=dev.toolbox.fluidbook.com
 
 REDIS_HOST=fluidbook-toolbox-dev-redis
 REDIS_PASSWORD=null
@@ -38,7 +39,7 @@ MAIL_USERNAME=workshop@cubedesigners.com
 MAIL_PASSWORD=4zrmk4Hu9HH97n7UiW5
 MAIL_ENCRYPTION=tls
 MAIL_FROM_ADDRESS=toolbox@fluidbook.com
-MAIL_FROM_NAME="Fluidbook Toolbox"
+MAIL_FROM_NAME="[DEV] Fluidbook Toolbox"
 MAIL_BCC_ALL=test+toolbox-dev@cubedesigners.com
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
@@ -52,7 +53,5 @@ SLACK_BOT_TOKEN=xoxb-12192359685-3923048219394-EXUQIBSc3VTO6RKr3Plrn1um
 BACKPACK_LOCALES=en,fr
 TIMEZONE=Europe/Paris
 
-BACKPACK_LICENSE=LFDA-FLAM-8919-GF6B-60DE-2702
-
 VAPID_PUBLIC_KEY=BNtDSMlXpG39rcsC-nwW_wfsVpfnpzGpM6hW3YpPFt1xERu7ux8Ve1BH3nYVE-Y-3VCO_n_WTHk8X4ak6j6gpRA
 VAPID_PRIVATE_KEY=GYvIMn542hv5XERqkz61aC923Lm76luB5O33jeayjD8

diff --git a/.env.prod b/.env.prod
index e6aa1676cc409bb91827b50439be394dd8496c40..83a3d4d3ee7f7f5d01f34575ccf669bd2a0b809b 100644 (file)
--- a/.env.prod
+++ b/.env.prod
@@ -26,6 +26,7 @@ QUEUE_CONNECTION=database
 
 SESSION_DRIVER=redis
 SESSION_LIFETIME=1200
+SESSION_DOMAIN=toolbox.fluidbook.com
 
 REDIS_HOST=fluidbook-toolbox-redis
 REDIS_PASSWORD=null

diff --git a/composer.json b/composer.json
index 929ff985c931be1b9bb79df591cb2ae4895d4365..7062f09a912495416b8603c4d1faf392931dfb0e 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         },
         {
             "type": "vcs",
-            "url": "https://github.com/EnhydraV/lucy"
+            "url": "https://github.com/EnhydraV/laravel-job"
         },
         {
             "type": "composer",
@@ -46,7 +46,7 @@
         "jsvrcek/ics": "^0.8.4",
         "laravel-notification-channels/webpush": "^7.1",
         "league/csv": "^9.9.0",
-        "mxl/laravel-job": "^v1.4.0",
+        "mxl/laravel-job": "dev-master",
         "nyholm/psr7": "^1.5.1",
         "php-ffmpeg/php-ffmpeg": "^v1.1.0",
         "rodneyrehm/plist": "^2.0",

diff --git a/composer.lock b/composer.lock
index cd1a536f779c90661da778338403fc25c92f995b..a921e493bf7375e24690edf42f132d22ec94d3b3 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "820d8b93497217b1365b8d7f1b2fa4d1",
+    "content-hash": "acbf857db884549552451fd0627e815a",
     "packages": [
         {
             "name": "archtechx/enums",
@@ -6235,16 +6235,16 @@
         },
         {
             "name": "mxl/laravel-job",
-            "version": "v1.4.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mxl/laravel-job.git",
-                "reference": "abb62d49612b284a7fbc7fa9dd678ec512c8155d"
+                "url": "https://github.com/EnhydraV/laravel-job.git",
+                "reference": "15ae0e1038d785d3c9a3745c418ab3cef71828c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mxl/laravel-job/zipball/abb62d49612b284a7fbc7fa9dd678ec512c8155d",
-                "reference": "abb62d49612b284a7fbc7fa9dd678ec512c8155d",
+                "url": "https://api.github.com/repos/EnhydraV/laravel-job/zipball/15ae0e1038d785d3c9a3745c418ab3cef71828c1",
+                "reference": "15ae0e1038d785d3c9a3745c418ab3cef71828c1",
                 "shasum": ""
             },
             "require": {
@@ -6254,6 +6254,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^9.2"
             },
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "laravel": {
@@ -6267,7 +6268,6 @@
                     "MichaelLedin\\LaravelJob\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -6290,7 +6290,7 @@
                 "issues": "https://github.com/mxl/laravel-job/issues",
                 "source": "https://github.com/mxl/laravel-job"
             },
-            "time": "2023-02-05T04:09:23+00:00"
+            "time": "2023-04-08T09:30:12+00:00"
         },
         {
             "name": "myclabs/php-enum",
@@ -16444,7 +16444,8 @@
         "cubist/matomo": 20,
         "cubist/pdf": 20,
         "cubist/scorm": 20,
-        "fluidbook/tools": 20
+        "fluidbook/tools": 20,
+        "mxl/laravel-job": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,