Skip to content

Commit 299d450

Browse files
committed
Remove changes covered by another PR.
1 parent 85e7fc3 commit 299d450

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

spryker/nginx/etc/confd/conf.d/nginx_site_internal_requests.conf.toml

Lines changed: 0 additions & 6 deletions
This file was deleted.

spryker/nginx/etc/confd/templates/nginx/site_internal_requests.conf.tmpl

Lines changed: 0 additions & 3 deletions
This file was deleted.

spryker/usr/local/share/container/baseimage-45.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ do_templating() {
2222

2323
alias_function do_start do_spryker_start_inner
2424
do_start() {
25-
do_spryker_hosts
2625
do_spryker_config_create
2726
do_spryker_start_inner
2827
}

spryker/usr/local/share/env/30-framework

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@ export YVES_HOST_PROTOCOL=${YVES_HOST_PROTOCOL:-https://}
3131
export ZED_HOST=${ZED_HOST:-zed}
3232
export ZED_HOST_PROTOCOL=${ZED_HOST_PROTOCOL:-https://}
3333

34-
export YVES_WEB_SERVER_NAME=${YVES_WEB_SERVER_NAME:-"yves $YVES_HOST"}
35-
export ZED_WEB_SERVER_NAME=${ZED_WEB_SERVER_NAME:-"zed $ZED_HOST"}
36-
3734
YVES_SESSION_COOKIE_SECURE="$(convert_to_boolean_string "${YVES_SESSION_COOKIE_SECURE:-true}")"
3835
export YVES_SESSION_COOKIE_SECURE
3936
ZED_SESSION_COOKIE_SECURE="$(convert_to_boolean_string "${ZED_SESSION_COOKIE_SECURE:-true}")"
4037
export ZED_SESSION_COOKIE_SECURE
4138

42-
export BASE_URL_ZED_API=${BASE_URL_ZED_API:-http://zed}
43-
export BASE_URL_SSL_ZED_API=${BASE_URL_ZED_API:-https://zed}
44-
4539
IS_CRON_RUNNING="$(convert_to_boolean_string "${IS_CRON_RUNNING:-true}")"
4640
export IS_CRON_RUNNING
4741

spryker/usr/local/share/spryker/spryker_functions.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,3 @@ do_spryker_setup_search() {
160160
do_spryker_run_tests() {
161161
as_code_owner "vendor/bin/codecept run --skip Acceptance"
162162
}
163-
164-
do_spryker_hosts() {
165-
set +e
166-
grep -q zed /etc/hosts
167-
HOSTS_UPDATED=$?
168-
set -e
169-
if [ "$HOSTS_UPDATED" != "0" ]; then
170-
# zed is required for internal endpoint and others are required for Acceptance tests to not loop over internet in order to resolve those endpoints
171-
echo "127.0.0.1 zed $ZED_HOST $YVES_HOST" >> /etc/hosts
172-
fi
173-
}

0 commit comments

Comments
 (0)