wip #6561 @1

diff --git a/.docker/alpha/docker-compose.yml b/.docker/alpha/docker-compose.yml
index aa375b181e8a26ded335b069075556d9b1625d0d..f657369fe6007c98f043298c71348b4e13195c06 100644 (file)
--- a/.docker/alpha/docker-compose.yml
+++ b/.docker/alpha/docker-compose.yml
@@ -64,7 +64,7 @@ services:
       - '/data/toolbox/alpha/.docker/config/php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
       - '/data/toolbox/alpha/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf'
       # ENV
-      - '/data/toolbox/alpha/.env.dev:/application/.env'
+      - '/data/toolbox/alpha/.env.alpha:/application/.env'
     ports:
       - '58748:8123'
       - '58749:22'
@@ -122,8 +122,6 @@ services:
     container_name: fluidbook-toolbox-alpha-mariadb
     image: 'mariadb'
     restart: unless-stopped
-    ports:
-      - 12331:3306
     environment:
       MARIADB_ROOT_PASSWORD: 9xHw8nyRuphyTvqC
       MARIADB_DATABASE: fluidbook-toolbox

diff --git a/.docker/alpha/update.sh b/.docker/alpha/update.sh
index a71c10d9454c442ebbfaee1bb84f048dc110a991..127adb2a0b6fcc9eb2fa5c29d32803a4e34e123d 100644 (file)
--- a/.docker/alpha/update.sh
+++ b/.docker/alpha/update.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
 cd /docker/fluidbook-toolbox-alpha
 docker plugin install ucphhpc/sshfs --grant-all-permissions
-/data/toolbox/alpha/scripts/fixrights.sh
-chown root:root /data/toolbox/alpha/.docker/config/cron/host;ln -sf /data/toolbox/alpha/.docker/config/cron/host /etc/cron.d/toolbox-alpha
 docker network create fluidbook-toolbox-alpha
 docker compose down
 docker volume rm fluidbook-toolbox-alpha_sshfsusstorage
 docker compose up -d
-/data/toolbox/alpha/scripts/fixrights.sh
-docker exec -it fluidbook-toolbox /application/scripts/update.sh
+docker exec -it fluidbook-toolbox-alpha /application/scripts/update.sh
 find /data/toolbox/alpha/ -type d \( -path /data/toolbox/alpha/.docker \) -prune -o -exec chown -R toolbox:www-data {} \;

diff --git a/.docker/dev/update.sh b/.docker/dev/update.sh
index d399473f16ec0ae3fbbaf50eb0c59fd4f68208ce..3fe7fd0c936efa1c64b8f427d65728f00efad6eb 100644 (file)
--- a/.docker/dev/update.sh
+++ b/.docker/dev/update.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
 cd /docker/fluidbook-toolbox-dev
 docker plugin install ucphhpc/sshfs --grant-all-permissions
-/home/toolbox/dev/scripts/fixrights.sh
-chown root:root /home/toolbox/dev/.docker/config/cron/host;ln -sf /home/toolbox/dev/.docker/config/cron/host /etc/cron.d/toolbox-dev
 docker network create fluidbook-toolbox-dev
 docker compose down
 docker volume rm fluidbook-toolbox-dev_sshfsusstorage
 docker compose up -d
-/home/toolbox/dev/scripts/fixrights.sh
-docker exec -it fluidbook-toolbox /application/scripts/update.sh
+docker exec -it fluidbook-toolbox-dev /application/scripts/update.sh
 find /home/toolbox/dev/ -type d \( -path /home/toolbox/dev/.docker \) -prune -o -exec chown -R toolbox:www-data {} \;

diff --git a/.env.alpha b/.env.alpha
new file mode 100644 (file)
index 0000000..0bedab7
--- /dev/null
+++ b/.env.alpha
@@ -0,0 +1,66 @@
+APP_NAME="[ALPHA] Fluidbook Toolbox"
+APP_ENV=alpha
+APP_KEY=base64:DRIdIwSEuQNkxuUTfyyRyssizosh3D9QHWTnobrW44U=
+
+APP_DEBUG=true
+DEBUGBAR_ENABLED=true
+DEBUGBAR_OPEN_STORAGE=true
+
+APP_URL=https://alpha.toolbox.fluidbook.com
+HEADER_COLOR="#df4759"
+THEME=toolbox
+POWERED_BY_LINK=https://www.fluidbook.com/
+
+LOG_CHANNEL=stack
+APP_LOG=daily
+
+LOG_SLACK_WEBHOOK_URL=https://hooks.slack.com/services/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
+SLACK_BOT_TOKEN=xoxb-12192359685-3923048219394-EXUQIBSc3VTO6RKr3Plrn1um
+
+DB_CONNECTION=mysql
+DB_HOST=fluidbook-toolbox-alpha-mariadb
+DB_PORT=3306
+DB_DATABASE=fluidbook_toolbox
+DB_USERNAME=root
+DB_PASSWORD=9xHw8nyRuphyTvqC
+
+DB_USER_DATABASE=extranet_users
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=redis
+
+QUEUE_CONNECTION=database
+
+SESSION_DRIVER=redis
+SESSION_LIFETIME=1200
+SESSION_DOMAIN=alpha.toolbox.fluidbook.com
+
+REDIS_HOST=fluidbook-toolbox-alpha-redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mail2.cubedesigners.com
+MAIL_PORT=587
+MAIL_USERNAME=workshop@cubedesigners.com
+MAIL_PASSWORD=4zrmk4Hu9HH97n7UiW5
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=toolbox+alpha@fluidbook.com
+MAIL_FROM_NAME="[ALPHA] Fluidbook Toolbox"
+MAIL_BCC_ALL=test+toolboxalpha@cubedesigners.com
+MAIL_TEAM_NAME=Fluidbook
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SCORM_CLOUD_APP_ID=VAAROP2RFR
+SCORM_CLOUD_SECRET_KEY=7PHpD9pQk4aIjUnlKgF8s89CGlhkIucZHJ3zMXuQ
+SCORM_CLOUD_PREFIX=toolbox_alpha_
+
+AZURE_API_KEY=adae11ef11d94aa98f31b2c233c1be7a
+
+BACKPACK_LOCALES=en,fr
+TIMEZONE=Europe/Paris
+
+VAPID_PUBLIC_KEY=BNtDSMlXpG39rcsC-nwW_wfsVpfnpzGpM6hW3YpPFt1xERu7ux8Ve1BH3nYVE-Y-3VCO_n_WTHk8X4ak6j6gpRA
+VAPID_PRIVATE_KEY=GYvIMn542hv5XERqkz61aC923Lm76luB5O33jeayjD8

diff --git a/.env.dev b/.env.dev
index b10b015092bc81358a5a8dc33b12ce29a7ad5074..c863c4a268355c6a8cf89989b78f3bf8589e8572 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -11,7 +11,6 @@ HEADER_COLOR="#df4759"
 THEME=toolbox
 POWERED_BY_LINK=https://www.fluidbook.com/
 
-
 LOG_CHANNEL=stack
 APP_LOG=daily
 

diff --git a/.env.prod b/.env.prod
index 035cd1d3a82e3adae08d733be8814970387796f6..0257c08d39dfd7d0822b1608a77963c5d8e8ac94 100644 (file)
--- a/.env.prod
+++ b/.env.prod
@@ -11,7 +11,6 @@ HEADER_COLOR="#263340"
 THEME=toolbox
 POWERED_BY_LINK=https://www.fluidbook.com/
 
-
 LOG_CHANNEL=stack
 APP_LOG=daily
 

diff --git a/bootstrap/app.php b/bootstrap/app.php
index 3f556bf9e58d89f75bbe3d8a0f8aca0940f1f341..e00625cc64e0d78c6c5198a9ed8bfc1d61fa9350 100644 (file)
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,6 +11,8 @@
 |
 */
 
+use Cubist\Backpack\Cache\CacheManager;
+
 $app = new Cubist\Backpack\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
@@ -56,5 +58,8 @@ $app->singleton(
 | from the actual running of the application and sending responses.
 |
 */
+$app->singleton('cache', function ($app) {
+    return new CacheManager($app);
+});
 
 return $app;