Skip to content

Commit

Permalink
Merge pull request #382 from EscolaLMS/develop
Browse files Browse the repository at this point in the history
release
  • Loading branch information
qunabu authored Dec 17, 2024
2 parents 7ea96a9 + c5d069b commit 2b79a7b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 12 deletions.
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions config/sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

return [

// Ignore OAuthServerException eg
// The token violates some mandatory constraints, details:
// - The token is expired
'ignore_exceptions' => [
\League\OAuth2\Server\Exception\OAuthServerException::class,
],
// @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/
'dsn' => env('SENTRY_LARAVEL_DSN', env('SENTRY_DSN')),

Expand Down
33 changes: 33 additions & 0 deletions init_multidomains.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,39 @@ else
echo "Environment variable MULTI_DOMAINS is empty."
fi

# Default setup
echo "Default setup"
# This is required for create default laravel envs
if [ -n "$JWT_PUBLIC_KEY_BASE64" ]; then
echo "Storing public RSA key for JWT generation - storage/oauth-public.key"
echo ${JWT_PUBLIC_KEY_BASE64} | base64 -d > storage/oauth-public.key
fi

if [ -n "$JWT_PRIVATE_KEY_BASE64" ]; then
echo "Storing private RSA key for JWT generation - storage/oauth-private.key"
echo ${JWT_PRIVATE_KEY_BASE64} | base64 -d > storage/oauth-private.key
fi


if [ "$DISABLE_DB_MIGRATE" == 'true' ]
then
echo "Disable db migrate"
else
php artisan migrate --force
fi

# generate passport keys only if storage/oauth-private.key is not set

FILE=storage/oauth-private.key
if [ -f "$FILE" ]; then
echo "$FILE exists."
else
echo "$FILE does not exist. Generating app keys, passport keys and passport client"
php artisan key:generate --force --no-interaction
php artisan passport:keys --force --no-interaction
php artisan passport:client --personal --no-interaction
fi

touch inited

# TODO: Fixme
Expand Down

0 comments on commit 2b79a7b

Please sign in to comment.