Merge branch 'master' of https://gitbase.de/OrangeJungle/CdsConnector
# Conflicts: # .env
This commit is contained in:
6
.env
6
.env
@@ -9,6 +9,7 @@
|
||||
# Real environment variables win over .env files.
|
||||
#
|
||||
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
|
||||
# https://symfony.com/doc/current/configuration/secrets.html
|
||||
#
|
||||
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
|
||||
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
|
||||
@@ -30,3 +31,8 @@ DATABASE_URL="mysql://root:geheim@127.0.0.1:3306/cds_connector?serverVersion=5.7
|
||||
###> nelmio/cors-bundle ###
|
||||
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
|
||||
###< nelmio/cors-bundle ###
|
||||
|
||||
SHOPWARE_API_URL="development.dev.localhost"
|
||||
SHOPWARE_API_KEY="S2hySDNyZ214dGRVQmFBSURQbkRvajIyZldxOHB4RktZakxaYmo"
|
||||
SHOPWARE_API_ID="SWUAB1JGAFHTMME5DUGWDWN1EQ"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user