From 37a7385362a0569b5d0261be09c322d74a7c6cf5 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 22 Apr 2021 15:25:45 +0200
Subject: [PATCH] Update the core/starter bundles
The starter bundle gained an example configuration and this adds an example
config file to set it.
---
.env | 7 ++++++-
composer.lock | 9 ++++-----
config/packages/dbp_starter.yaml | 2 ++
3 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 config/packages/dbp_starter.yaml
diff --git a/.env b/.env
index 5a8f1a6..8364fa6 100644
--- a/.env
+++ b/.env
@@ -30,4 +30,9 @@ KEYCLOAK_CLIENT_SECRET=
# Deployment related
APP_BUILDINFO=unknown # a git hash or something identifying the build
-APP_BUILDINFO_URL='#'
\ No newline at end of file
+APP_BUILDINFO_URL='#'
+
+# Secret token for the starter bundle example
+# This is just a defaule.
+# Create a ".env.local" file which is excluded from git to set it
+STARTER_SECRET_TOKEN=
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 342fe08..183df05 100644
--- a/composer.lock
+++ b/composer.lock
@@ -226,7 +226,7 @@
"source": {
"type": "git",
"url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle.git",
- "reference": "6f3bf973ad3374ab018a826164f00358e057e404"
+ "reference": "7a6d413cc8e43176945aa6d2a564441990b80cc4"
},
"require": {
"api-platform/core": "^2.6.3",
@@ -238,7 +238,6 @@
"nelmio/cors-bundle": "^2.1.0",
"php": "^7.3",
"phpdocumentor/reflection-docblock": "^3.0 || ^4.0 || ^5.0",
- "psr/link": "1.0",
"symfony/asset": "*",
"symfony/config": "^4.4",
"symfony/expression-language": "*",
@@ -303,7 +302,7 @@
"license": [
"AGPL-3.0-or-later"
],
- "time": "2021-04-15T09:51:39+00:00"
+ "time": "2021-04-22T09:45:52+00:00"
},
{
"name": "dbp/api-starter-bundle",
@@ -311,7 +310,7 @@
"source": {
"type": "git",
"url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle.git",
- "reference": "1e233d32f8ead03e21b82f909b21de9d6da58dfb"
+ "reference": "aa6539867455bf8cb6f4b16b7ea1bd95f6d5aae4"
},
"require": {
"api-platform/core": "^2.5",
@@ -371,7 +370,7 @@
"license": [
"AGPL-3.0-or-later"
],
- "time": "2021-04-15T10:26:19+00:00"
+ "time": "2021-04-22T13:21:44+00:00"
},
{
"name": "doctrine/annotations",
diff --git a/config/packages/dbp_starter.yaml b/config/packages/dbp_starter.yaml
new file mode 100644
index 0000000..21ed834
--- /dev/null
+++ b/config/packages/dbp_starter.yaml
@@ -0,0 +1,2 @@
+dbp_starter:
+ secret_token: '%env(STARTER_SECRET_TOKEN)%'
\ No newline at end of file
--
GitLab