From 623eed965207e4f1e26a6f223fa9e943ed51b2ef Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 7 Dec 2023 18:32:33 +0100 Subject: [PATCH] wip #6561 @1 --- .docker/alpha/docker-compose.yml | 4 +- .docker/alpha/update.sh | 5 +-- .docker/dev/update.sh | 5 +-- .env.alpha | 66 ++++++++++++++++++++++++++++++++ .env.dev | 1 - .env.prod | 1 - bootstrap/app.php | 5 +++ 7 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 .env.alpha diff --git a/.docker/alpha/docker-compose.yml b/.docker/alpha/docker-compose.yml index aa375b181..f657369fe 100644 --- 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 a71c10d94..127adb2a0 100644 --- 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 d399473f1..3fe7fd0c9 100644 --- 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 index 000000000..0bedab7a3 --- /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 b10b01509..c863c4a26 100644 --- 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 035cd1d3a..0257c08d3 100644 --- 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 3f556bf9e..e00625cc6 100644 --- 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; -- 2.39.5