sigil-merge

CHANGELOG.txt

@@ -1,3 +1,9 @@
+[0.2.12]
+- sigil is back for test
+
+[0.2.11]
+- does not need sigil with schema stitching
+
 [0.2.10]
 - middlwares removed
 - orm removed

nginx.conf.sigil

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {{ $proxy_settings := "proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; proxy_set_header Host $http_host; proxy_set_header X-Request-Start $msec;" }}
 {{ $gzip_settings := "gzip on; gzip_min_length  1100; gzip_buffers  4 32k; gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml; gzip_vary on; gzip_comp_level  6;" }}
 
@@ -10,6 +11,15 @@ map $http_origin $allow_origin {
     default "";
 }
 
+=======
+map $http_origin $allow_origin {
+    ~^https?:\/\/((.*\.)?localhost(:\d+)?|discoursio-webapp(-.*)?\.vercel\.app|(.*\.)?discours\.io)$ $http_origin;
+    default "";
+}
+
+{{ $proxy_settings := "proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Port $server_port; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Request-Start $msec; proxy_read_timeout 60s; proxy_buffer_size 4096; proxy_buffering on; proxy_buffers 8 4096; proxy_busy_buffers_size 8192;" }}
+{{ $gzip_settings := "gzip on; gzip_min_length  1100; gzip_buffers  4 32k; gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml; gzip_vary on; gzip_comp_level  6;" }}
+>>>>>>> 7aca912bc15b70a3a0ca4748a2089bac77ed3aaf
 {{ range $port_map := .PROXY_PORT_MAP | split " " }}
 {{ $port_map_list := $port_map | split ":" }}
 {{ $scheme := index $port_map_list 0 }}
@@ -18,6 +28,7 @@ map $http_origin $allow_origin {
 
 server {
     {{ if eq $scheme "http" }}
+<<<<<<< HEAD
         listen [::]:{{ $listen_port }};
         listen {{ $listen_port }};
         server_name {{ $.NOSSL_SERVER_NAME }};
@@ -39,19 +50,46 @@ server {
     {{ end }}
 
 
+=======
+        listen {{ $listen_port }};
+        server_name {{ $.NOSSL_SERVER_NAME }};
+    {{ else if eq $scheme "https" }}
+        listen {{ $listen_port }} ssl http2;
+        server_name {{ $.NOSSL_SERVER_NAME }};
+        ssl_certificate {{ $.APP_SSL_PATH }}/server.crt;
+        ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key;
+    {{ end }}
+
+>>>>>>> 7aca912bc15b70a3a0ca4748a2089bac77ed3aaf
     location / {
         proxy_pass  http://{{ $.APP }}-{{ $upstream_port }};
         {{ $proxy_settings }}
         {{ $gzip_settings }}
+<<<<<<< HEAD
         {{ $cors_headers_options }}
         {{ $cors_headers_post }}
         {{ $cors_headers_get }}
+=======
+
+        add_header 'Access-Control-Allow-Origin' '$allow_origin' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
+        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+        add_header 'Access-Control-Allow-Credentials' 'true' always;
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain; charset=utf-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+>>>>>>> 7aca912bc15b70a3a0ca4748a2089bac77ed3aaf
     }
 
     location /connect {
         proxy_pass  http://presence-8080;
         {{ $proxy_settings }}
         {{ $gzip_settings }}
+<<<<<<< HEAD
         {{ $cors_headers_options }}
         {{ $cors_headers_post }}
         {{ $cors_headers_get }}
@@ -106,5 +144,58 @@ upstream {{ $.APP }}-{{ $upstream_port }} {
 {{ $listener_port := index $listener_list 1 }}
   server {{ $listener_ip }}:{{ $upstream_port }};
 {{ end }}
+=======
+
+        add_header 'Access-Control-Allow-Origin' '$allow_origin' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
+        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+        add_header 'Access-Control-Allow-Credentials' 'true' always;
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain; charset=utf-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+    }
+
+    client_max_body_size 100m;
+    include /home/dokku/{{ $.APP }}/nginx.conf.d/*.conf;
+
+    error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
+    location /400-error.html {
+        root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+        internal;
+    }
+
+    error_page 404 /404-error.html;
+    location /404-error.html {
+        root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+        internal;
+    }
+
+    error_page 500 501 503 504 505 506 507 508 509 510 511 /500-error.html;
+    location /500-error.html {
+        root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+        internal;
+    }
+
+    error_page 502 /502-error.html;
+    location /502-error.html {
+        root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+        internal;
+    }
+}
+{{ end }}
+
+{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
+upstream {{ $.APP }}-{{ $upstream_port }} {
+    {{ range $listeners := $.DOKKU_APP_WEB_LISTENERS | split " " }}
+    {{ $listener_list := $listeners | split ":" }}
+    {{ $listener_ip := index $listener_list 0 }}
+    {{ $listener_port := index $listener_list 1 }}
+    server {{ $listener_ip }}:{{ $upstream_port }};
+    {{ end }}
+>>>>>>> 7aca912bc15b70a3a0ca4748a2089bac77ed3aaf
 }
 {{ end }}