From 4f7b1fdadb31b27e9b86e2c618aacad747fa1e20 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Thu, 9 Aug 2018 14:40:58 +0200 Subject: [PATCH] Use environmental variables for parameters --- .env.dist | 23 +++++++++++++++++++++++ app/config/config.yml | 5 ----- app/config/parameters.yml.dist | 31 ------------------------------- config/packages/doctrine.yaml | 8 +------- config/packages/framework.yaml | 4 ++-- config/packages/liip_imagine.yaml | 2 +- config/packages/swiftmailer.yaml | 5 +---- 7 files changed, 28 insertions(+), 50 deletions(-) create mode 100644 .env.dist delete mode 100644 app/config/config.yml delete mode 100644 app/config/parameters.yml.dist diff --git a/.env.dist b/.env.dist new file mode 100644 index 0000000000..44f78585a1 --- /dev/null +++ b/.env.dist @@ -0,0 +1,23 @@ +# This file is a "template" of which env vars needs to be defined in your configuration or in an .env file +# Set variables here that may be different on each deployment target of the app, e.g. development, staging, production. +# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration + +###> symfony/framework-bundle ### +APP_ENV=dev +APP_DEBUG=1 +APP_SECRET=EDITME +###< symfony/framework-bundle ### + +###> doctrine/doctrine-bundle ### +# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" +# Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls +DATABASE_URL=mysql:///root@127.0.0.1/sylius_${APP_ENV}?serverVersion=5.5 +###< doctrine/doctrine-bundle ### + +###> symfony/swiftmailer-bundle ### +# For Gmail as a transport, use: "gmail://username:password@localhost" +# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" +# Delivery is disabled by default via "null://localhost" +MAILER_URL=smtp://localhost +###< symfony/swiftmailer-bundle ### diff --git a/app/config/config.yml b/app/config/config.yml deleted file mode 100644 index 5552e7d0c5..0000000000 --- a/app/config/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -# This file is part of the Sylius package. -# (c) Paweł Jędrzejewski - -imports: - - { resource: "parameters.yml" } diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist deleted file mode 100644 index 95647d122f..0000000000 --- a/app/config/parameters.yml.dist +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - database_driver: "%env(SYLIUS_DATABASE_DRIVER)%" - database_host: "%env(SYLIUS_DATABASE_HOST)%" - database_port: "%env(SYLIUS_DATABASE_PORT)%" - database_name: "%env(SYLIUS_DATABASE_NAME)%" - database_user: "%env(SYLIUS_DATABASE_USER)%" - database_password: "%env(SYLIUS_DATABASE_PASSWORD)%" - # You should uncomment this if you want use pdo_sqlite. - # database_path: "%kernel.project_dir%/data.db3" - - mailer_transport: "%env(SYLIUS_MAILER_TRANSPORT)%" - mailer_host: "%env(SYLIUS_MAILER_HOST)%" - mailer_user: "%env(SYLIUS_MAILER_USER)%" - mailer_password: "%env(SYLIUS_MAILER_PASSWORD)%" - - secret: "%env(SYLIUS_SECRET)%" - - # Fallback values (used if environmental variables are not set) - env(SYLIUS_DATABASE_DRIVER): pdo_mysql - env(SYLIUS_DATABASE_HOST): 127.0.0.1 - env(SYLIUS_DATABASE_PORT): ~ - env(SYLIUS_DATABASE_NAME): sylius - env(SYLIUS_DATABASE_USER): root - env(SYLIUS_DATABASE_PASSWORD): ~ - - env(SYLIUS_MAILER_TRANSPORT): smtp - env(SYLIUS_MAILER_HOST): 127.0.0.1 - env(SYLIUS_MAILER_USER): ~ - env(SYLIUS_MAILER_PASSWORD): ~ - - env(SYLIUS_SECRET): EDITME diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 33b98b0d62..b416bf1c80 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -1,10 +1,4 @@ doctrine: dbal: - driver: "%database_driver%" - host: "%database_host%" - port: "%database_port%" - dbname: "%database_name%" - user: "%database_user%" - password: "%database_password%" - server_version: "5.5" + url: '%env(resolve:DATABASE_URL)%' charset: UTF8 diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 20614f5f53..86107188a4 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -1,9 +1,9 @@ framework: translator: { fallbacks: ["%locale%", "en"] } - secret: "%secret%" + secret: '%env(APP_SECRET)%' router: resource: "%kernel.project_dir%/app/config/routing.yml" - strict_requirements: "%kernel.debug%" + strict_requirements: '%kernel.debug%' form: true csrf_protection: true validation: { enable_annotations: true } diff --git a/config/packages/liip_imagine.yaml b/config/packages/liip_imagine.yaml index 0170381184..bb2e7ceb9b 100644 --- a/config/packages/liip_imagine.yaml +++ b/config/packages/liip_imagine.yaml @@ -2,5 +2,5 @@ liip_imagine: resolvers: default: web_path: - web_root: "%kernel.project_dir%/web" + web_root: "%kernel.project_dir%/public" cache_prefix: "media/cache" diff --git a/config/packages/swiftmailer.yaml b/config/packages/swiftmailer.yaml index 7441da2aae..3bab0d32f3 100644 --- a/config/packages/swiftmailer.yaml +++ b/config/packages/swiftmailer.yaml @@ -1,5 +1,2 @@ swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" + url: '%env(MAILER_URL)%'