diff --git a/codeception.yml b/codeception.yml index 8c7b61d40..56517e8c1 100644 --- a/codeception.yml +++ b/codeception.yml @@ -25,7 +25,7 @@ modules: coverage: enabled: true remote: true - c3_url: 'http://zed.de.spryker.dev' + c3_url: 'http://zed.de.project.local' whitelist: { include: ['src/Pyz/*.php'] } extensions: diff --git a/config/Shared/ci/travis/travis-ci-apache-yves b/config/Shared/ci/travis/travis-ci-apache-yves index 453c3683f..854a829a6 100644 --- a/config/Shared/ci/travis/travis-ci-apache-yves +++ b/config/Shared/ci/travis/travis-ci-apache-yves @@ -1,7 +1,7 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Yves - ServerName www.de.spryker.dev + ServerName www.de.spryker.local SetHandler application/x-httpd-php diff --git a/config/Shared/ci/travis/travis-ci-apache-zed b/config/Shared/ci/travis/travis-ci-apache-zed index ff65eae46..06430bf01 100644 --- a/config/Shared/ci/travis/travis-ci-apache-zed +++ b/config/Shared/ci/travis/travis-ci-apache-zed @@ -1,7 +1,7 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Zed - ServerName zed.de.spryker.dev + ServerName zed.de.spryker.local ErrorLog /tmp/zed-error.log diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php index 5d2eabffa..b2992162e 100644 --- a/config/Shared/config_default-development_DE.php +++ b/config/Shared/config_default-development_DE.php @@ -13,7 +13,7 @@ $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL]; $config[PropelConstants::ZED_DB_PORT] = 5432; -$yvesHost = 'www.de.spryker.dev'; +$yvesHost = 'www.de.project.local'; $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost; $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost; $config[SessionConstants::YVES_SESSION_COOKIE_DOMAIN] = $yvesHost; @@ -21,7 +21,7 @@ $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost; $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost; -$zedHost = 'zed.de.spryker.dev'; +$zedHost = 'zed.de.project.local'; $config[ApplicationConstants::HOST_ZED_GUI] = 'http://' . $zedHost; $config[ApplicationConstants::HOST_ZED_API] = $zedHost; @@ -32,12 +32,12 @@ $config[SessionConstants::ZED_SESSION_COOKIE_NAME] = $zedHost; $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.de.spryker.dev'; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.de.spryker.dev'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local'; $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; -$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; /* Elasticsearch */ $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search'; diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php index 9e3108d46..80e988760 100644 --- a/config/Shared/config_default-development_US.php +++ b/config/Shared/config_default-development_US.php @@ -3,14 +3,14 @@ use Spryker\Shared\Application\ApplicationConstants; use Spryker\Shared\Mail\MailConstants; -$yvesHost = 'www.com.spryker.dev'; +$yvesHost = 'www.com.project.local'; $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost; $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost; $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost; $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost; -$zedHost = 'zed.com.spryker.dev'; +$zedHost = 'zed.com.project.local'; $config[ApplicationConstants::HOST_ZED_GUI] = $config[ApplicationConstants::HOST_ZED_API] = 'http://' . $zedHost; @@ -18,19 +18,19 @@ = $config[ApplicationConstants::HOST_SSL_ZED_API] = 'https://' . $zedHost; -$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.com.spryker.dev'; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.com.spryker.dev'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; /* RabbitMQ */ $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost'; $config[ApplicationConstants::ZED_RABBITMQ_PORT] = '5672'; -$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'DE_development'; +$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'US_development'; $config[ApplicationConstants::ZED_RABBITMQ_PASSWORD] = 'mate20mg'; -$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/DE_development_zed'; +$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/US_development_zed'; /* Elasticsearch */ $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'us_search'; diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php new file mode 100644 index 000000000..baf2301b8 --- /dev/null +++ b/config/Shared/config_default-devtest.php @@ -0,0 +1,41 @@ + '', +]; + +$config[ApplicationConstants::JENKINS_BASE_URL] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':10007/jenkins'; +$config[ApplicationConstants::JENKINS_DIRECTORY] = '/data/shop/development/shared/data/common/jenkins'; + +$config[ApplicationConstants::APPLICATION_SPRYKER_ROOT] = APPLICATION_ROOT_DIR . '/vendor/spryker/spryker/Bundles'; diff --git a/config/Shared/config_default-devtest_DE.php b/config/Shared/config_default-devtest_DE.php new file mode 100644 index 000000000..7998e7550 --- /dev/null +++ b/config/Shared/config_default-devtest_DE.php @@ -0,0 +1,16 @@ +