Compare commits

...

5 Commits

Author SHA1 Message Date
1ef5ef50a3 update composer files
All checks were successful
continuous-integration/drone/tag Build is passing
2023-02-03 09:56:15 +01:00
491c5f3b49 deploy: update version of chill-bundles
All checks were successful
continuous-integration/drone/tag Build is passing
2023-01-13 21:09:41 +01:00
8d3b56c6fe DX: avoid duplicate config 2023-01-13 18:21:02 +01:00
4157b4bb21 Feature: adapt skeleton for wopi / jwt and secret/public keys in base64 format in production
All checks were successful
continuous-integration/drone/tag Build is passing
2023-01-13 13:31:11 +01:00
99ec0b765f Feature: trigger migration automatically only in prod mode 2023-01-13 13:26:10 +01:00
6 changed files with 307 additions and 451 deletions

View File

@@ -15,7 +15,7 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "dev-43-wopi-use-access-token@dev", "chill-project/chill-bundles": "dev-master#c64ec89274196fa1532fc88584a3a88430c4cfa1",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5", "symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",

729
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,9 @@
lexik_jwt_authentication:
# in production, the secret must be located in an environment variable
# for converting the file to a raw variable, use this command:
#
# cat path/to/private_or_public.pem | base64 -w0
#
# then copy past the printed string into the dedicated environment variable
secret_key: '%env(base64:resolve:JWT_SECRET_KEY)%'
public_key: '%env(base64:resolve:JWT_PUBLIC_KEY)%'

View File

@@ -1,3 +1,2 @@
wopi: wopi:
server: "%env(resolve:WOPI_SERVER)%" server: "%env(resolve:WOPI_SERVER)%"
access_token_ttl: 0

View File

@@ -35,11 +35,6 @@ services:
resource: '../src/Service/' resource: '../src/Service/'
Chill\WopiBundle\Service\Wopi\ChillWopi:
decorates: ChampsLibres\WopiLib\Contract\Service\WopiInterface
arguments:
$cache: '@cache.user_data'
ChampsLibres\WopiLib\Service\DocumentLockManager: ChampsLibres\WopiLib\Service\DocumentLockManager:
arguments: arguments:
$cache: '@cache.user_data' $cache: '@cache.user_data'

View File

@@ -36,6 +36,12 @@ fi
if [ "${APP_ENV}" = "prod" ]; then if [ "${APP_ENV}" = "prod" ]; then
composer dump-env "${APP_ENV}" composer dump-env "${APP_ENV}"
chmod +r /var/www/app/.env.local.php chmod +r /var/www/app/.env.local.php
if [ "${PREVENT_MIGRATIONS}" != "true" ]; then
php /var/www/app/bin/console doctrine:migrations:status
php /var/www/app/bin/console doctrine:migrations:migrate -n
php /var/www/app/bin/console messenger:setup-transports
fi
fi fi
if [ "${CLEAR_CACHE}" != "false" ]; then if [ "${CLEAR_CACHE}" != "false" ]; then
@@ -45,11 +51,5 @@ if [ "${CLEAR_CACHE}" != "false" ]; then
chgrp ${PHP_FPM_GROUP} /var/www/app/var/log -R && chmod g+rw /var/www/app/var/log -R chgrp ${PHP_FPM_GROUP} /var/www/app/var/log -R && chmod g+rw /var/www/app/var/log -R
fi fi
if [ "${PREVENT_MIGRATIONS}" != "true" ]; then
php /var/www/app/bin/console doctrine:migrations:status
php /var/www/app/bin/console doctrine:migrations:migrate -n
php /var/www/app/bin/console messenger:setup-transports
fi
exec "${@}" exec "${@}"