Skip to content

Commit 17c758a

Browse files
committed
Merge branch 'release/1.0.7'
2 parents 0f75e43 + 37ef656 commit 17c758a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

common/base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
- internal
3131
restart: always
3232
letsencrypt-nginx-companion:
33-
image: jrcs/letsencrypt-nginx-proxy-companion:v1.5
33+
image: jrcs/letsencrypt-nginx-proxy-companion:v1.6
3434
container_name: core-letsencrypt-nginx-companion
3535
volumes_from:
3636
- nginx

common/conf/nginx.tmpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,15 @@ server {
201201
{{ else if (exists "/etc/nginx/vhost.d/default_location") }}
202202
include /etc/nginx/vhost.d/default_location;
203203
{{ end }}
204+
if ($http_origin ~* (.*)) {
205+
add_header 'Access-Control-Allow-Origin' '*';
206+
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE, PUT';
207+
add_header 'Access-Control-Allow-Credentials' 'true';
208+
add_header 'Access-Control-Allow-Headers' 'User-Agent,Keep-Alive,Content-Type';
209+
}
210+
if ($request_method = OPTIONS) {
211+
return 204;
212+
}
204213
}
205214
}
206215

0 commit comments

Comments
 (0)