Skip to content

Commit e7f3769

Browse files
committed
Nuxt/payload/php: ensure CORS headers work for normal requests
1 parent adfcb87 commit e7f3769

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

database-backup/scripts/other/lib/scw.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ scw_sync_backups() {
109109
continue
110110
fi
111111

112-
echo "Waiting for backup ${backup_id} to be ready…"
112+
echo "Waiting for backup ${backup_id} (${backup_id}) to be ready…"
113113
scw_wait_on_backup "$backup_id"
114114
if ! download_url=$(scw_get_backup_export_url "$backup_id"); then
115115
echo "Failed to export backup ${backup_id}: ${download_url}" >&2
@@ -119,10 +119,9 @@ scw_sync_backups() {
119119
# Sync it
120120
echo "Syncing backup ${backup_name} (${backup_id})…"
121121
"$sync_callback" "$download_url" "$backup_name"
122-
123-
echo "Finished syncing backup ${backup_name} (${backup_id}). Deleting backup from provider…"
124122

125123
# Delete backup
124+
echo "Deleting backup ${backup_name} (${backup_id}) from provider…"
126125
scw_delete_backup "$backup_id"
127126

128127
echo "Finished processing backup ${backup_name} (${backup_id})."

nuxt-base/config/nginx/http.d/default.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ server {
2323

2424
# Serve Nuxt
2525
location @api_backend {
26+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
2627
include /etc/nginx/snippets/headers/cors.conf;
2728
include /etc/nginx/snippets/headers/security-api-content.conf;
2829
include /etc/nginx/snippets/proxy/config.conf;
29-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
3030
proxy_pass http://127.0.0.1:3000;
3131
}
3232
location @resource_backend {
33+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
3334
include /etc/nginx/snippets/proxy/config.conf;
34-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
3535
proxy_pass http://127.0.0.1:3000;
3636
}
3737
location @web_backend {
38+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
3839
include /etc/nginx/snippets/headers/security-web-content.conf;
3940
include /etc/nginx/snippets/proxy/config.conf;
40-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
4141
proxy_pass http://127.0.0.1:3000;
4242
}
4343

payload-base/config/nginx/http.d/default.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ server {
1818

1919
# Serve Nuxt
2020
location @api_backend {
21+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
2122
include /etc/nginx/snippets/headers/cors.conf;
2223
include /etc/nginx/snippets/headers/security-api-content.conf;
2324
include /etc/nginx/snippets/proxy/config.conf;
24-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
2525
proxy_pass http://127.0.0.1:3000;
2626
}
2727
location @resource_backend {
28+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
2829
include /etc/nginx/snippets/proxy/config.conf;
29-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
3030
proxy_pass http://127.0.0.1:3000;
3131
}
3232
location @web_backend {
33+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
3334
include /etc/nginx/snippets/headers/security-web-content.conf;
3435
include /etc/nginx/snippets/proxy/config.conf;
35-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
3636
proxy_pass http://127.0.0.1:3000;
3737
}
3838

php-base/config/nginx/http.d/default-fpm.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ server {
2929

3030
# Serve PHP (multiple variations)
3131
location @api_backend {
32+
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf; # Place before others, order matters
3233
include /etc/nginx/snippets/headers/cors.conf;
3334
include /etc/nginx/snippets/headers/security-api-content.conf;
3435
include /etc/nginx/snippets/fastcgi/config-php.conf;
35-
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf;
3636
fastcgi_pass unix:/run/php-fpm.sock;
3737
}
3838
location @resource_backend {
39+
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf; # Place before others, order matters
3940
include /etc/nginx/snippets/fastcgi/config-php.conf;
40-
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf;
4141
fastcgi_pass unix:/run/php-fpm.sock;
4242
}
4343
location @web_backend {
44+
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf; # Place before others, order matters
4445
include /etc/nginx/snippets/headers/security-web-content.conf;
4546
include /etc/nginx/snippets/fastcgi/config-php.conf;
46-
include /etc/nginx/snippets/fastcgi/avoid-double-headers.conf;
4747
fastcgi_pass unix:/run/php-fpm.sock;
4848
}
4949

php-base/config/nginx/http.d/default-octane.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,33 @@ server {
2929

3030
# Serve PHP (multiple variations)
3131
location @api_backend {
32+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
3233
include /etc/nginx/snippets/headers/cors.conf;
3334
include /etc/nginx/snippets/headers/security-api-content.conf;
3435
set $suffix "";
3536
if ($uri = /index.php) {
3637
set $suffix ?$query_string;
3738
}
3839
include /etc/nginx/snippets/proxy/config.conf;
39-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
4040
proxy_pass http://127.0.0.1:3000$suffix;
4141
}
4242
location @resource_backend {
43+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
4344
set $suffix "";
4445
if ($uri = /index.php) {
4546
set $suffix ?$query_string;
4647
}
4748
include /etc/nginx/snippets/proxy/config.conf;
48-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
4949
proxy_pass http://127.0.0.1:3000$suffix;
5050
}
5151
location @web_backend {
52+
include /etc/nginx/snippets/proxy/avoid-double-headers.conf; # Place before others, order matters
5253
include /etc/nginx/snippets/headers/security-web-content.conf;
5354
set $suffix "";
5455
if ($uri = /index.php) {
5556
set $suffix ?$query_string;
5657
}
5758
include /etc/nginx/snippets/proxy/config.conf;
58-
include /etc/nginx/snippets/proxy/avoid-double-headers.conf;
5959
proxy_pass http://127.0.0.1:3000$suffix;
6060
}
6161

0 commit comments

Comments
 (0)