Merge branch 'release/1.0.7'

BD2KGenomics · Dec 15, 2017 · 17c758a · 17c758a
2 parents 0f75e43 + 37ef656
commit 17c758a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/common/base.yml b/common/base.yml
@@ -30,7 +30,7 @@ services:
       - internal
     restart: always
   letsencrypt-nginx-companion:
-    image: jrcs/letsencrypt-nginx-proxy-companion:v1.5
+    image: jrcs/letsencrypt-nginx-proxy-companion:v1.6
     container_name: core-letsencrypt-nginx-companion
     volumes_from:
       - nginx

diff --git a/common/conf/nginx.tmpl b/common/conf/nginx.tmpl
@@ -201,6 +201,15 @@ server {
                 {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
                 include /etc/nginx/vhost.d/default_location;
                 {{ end }}
+		if ($http_origin ~* (.*)) {
+			add_header 'Access-Control-Allow-Origin' '*';
+			add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE, PUT';
+			add_header 'Access-Control-Allow-Credentials' 'true';
+			add_header 'Access-Control-Allow-Headers' 'User-Agent,Keep-Alive,Content-Type';
+		}
+		if ($request_method = OPTIONS) {
+			return 204;
+		}
 	}
 }