Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
2. Run `composer update shopsys/deployment`
3. Check files in mentioned pull requests and if you have any of them extended in your project, apply changes manually

## Upgrade from v4.4.0 to v4.5.0

- added gopay payment notification url handled by backend with fallback to storefront ([#65](https://github.com/shopsys/deployment/pull/65))

## Upgrade from v4.3.0 to v4.4.0

- yq was updated to the newest version ([#63](https://github.com/shopsys/deployment/pull/63))
Expand Down
13 changes: 13 additions & 0 deletions kubernetes/configmap/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,19 @@ data:
return 470; # send to @app
}

location ~ ^/(?:[^/]+/)?order/payment-status-notify(?:/|$) {
fastcgi_intercept_errors on;
add_header "Access-Control-Allow-Origin" "";

fastcgi_pass php-upstream;
include fastcgi_params;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $realpath_root/index.php;
fastcgi_param HTTPS $http_x_forwarded_proto;
fastcgi_param HTTP_HOST $request_host;
error_page 404 = @storefront;
}

# location for administration interface, uses admin error pages
location ~ ^/(?:[^/]+/)?({{ADMIN_URL}}|ckeditor|elfinder(\.main\.js)?|efconnect|build|bundles)(?:/|$) {
# hide dotfiles (send to @app)
Expand Down
13 changes: 13 additions & 0 deletions tests/scenarios/basic-production/expected/webserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@ data:
return 470; # send to @app
}

location ~ ^/(?:[^/]+/)?order/payment-status-notify(?:/|$) {
fastcgi_intercept_errors on;
add_header "Access-Control-Allow-Origin" "";

fastcgi_pass php-upstream;
include fastcgi_params;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $realpath_root/index.php;
fastcgi_param HTTPS $http_x_forwarded_proto;
fastcgi_param HTTP_HOST $request_host;
error_page 404 = @storefront;
}

# location for administration interface, uses admin error pages
location ~ ^/(?:[^/]+/)?(admin|ckeditor|elfinder(\.main\.js)?|efconnect|build|bundles)(?:/|$) {
# hide dotfiles (send to @app)
Expand Down
13 changes: 13 additions & 0 deletions tests/scenarios/development-single-domain/expected/webserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,19 @@ data:
return 470; # send to @app
}

location ~ ^/(?:[^/]+/)?order/payment-status-notify(?:/|$) {
fastcgi_intercept_errors on;
add_header "Access-Control-Allow-Origin" "";

fastcgi_pass php-upstream;
include fastcgi_params;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $realpath_root/index.php;
fastcgi_param HTTPS $http_x_forwarded_proto;
fastcgi_param HTTP_HOST $request_host;
error_page 404 = @storefront;
}

# location for administration interface, uses admin error pages
location ~ ^/(?:[^/]+/)?(admin|ckeditor|elfinder(\.main\.js)?|efconnect|build|bundles)(?:/|$) {
# hide dotfiles (send to @app)
Expand Down
13 changes: 13 additions & 0 deletions tests/scenarios/escaping-env/expected/webserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@ data:
return 470; # send to @app
}

location ~ ^/(?:[^/]+/)?order/payment-status-notify(?:/|$) {
fastcgi_intercept_errors on;
add_header "Access-Control-Allow-Origin" "";

fastcgi_pass php-upstream;
include fastcgi_params;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $realpath_root/index.php;
fastcgi_param HTTPS $http_x_forwarded_proto;
fastcgi_param HTTP_HOST $request_host;
error_page 404 = @storefront;
}

# location for administration interface, uses admin error pages
location ~ ^/(?:[^/]+/)?(admin|ckeditor|elfinder(\.main\.js)?|efconnect|build|bundles)(?:/|$) {
# hide dotfiles (send to @app)
Expand Down
13 changes: 13 additions & 0 deletions tests/scenarios/production-with-cloudflare/expected/webserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@ data:
return 470; # send to @app
}

location ~ ^/(?:[^/]+/)?order/payment-status-notify(?:/|$) {
fastcgi_intercept_errors on;
add_header "Access-Control-Allow-Origin" "";

fastcgi_pass php-upstream;
include fastcgi_params;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $realpath_root/index.php;
fastcgi_param HTTPS $http_x_forwarded_proto;
fastcgi_param HTTP_HOST $request_host;
error_page 404 = @storefront;
}

# location for administration interface, uses admin error pages
location ~ ^/(?:[^/]+/)?(admin|ckeditor|elfinder(\.main\.js)?|efconnect|build|bundles)(?:/|$) {
# hide dotfiles (send to @app)
Expand Down