From 10b0200b222c0f491f21e294bd5835134bd17b0b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Sep 2021 09:08:46 +0200 Subject: [PATCH 1/5] for deploy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2cd70474..df6ccc8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ bson python-frontmatter transliterate requests -bcrypt +bcrypt \ No newline at end of file From 06c68a0309914385036abede60af8c9e2ab1c618 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Sep 2021 10:56:01 +0200 Subject: [PATCH 2/5] add nginx config --- nginx.conf.sigil | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 nginx.conf.sigil diff --git a/nginx.conf.sigil b/nginx.conf.sigil new file mode 100644 index 00000000..0d6332b2 --- /dev/null +++ b/nginx.conf.sigil @@ -0,0 +1,63 @@ +{{ range $port_map := .PROXY_PORT_MAP | split " " }} +{{ $port_map_list := $port_map | split ":" }} +{{ $scheme := index $port_map_list 0 }} +{{ $listen_port := index $port_map_list 1 }} +{{ $upstream_port := index $port_map_list 2 }} + +location / { + + 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; + + proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; + proxy_http_version 1.1; + proxy_read_timeout {{ $.PROXY_READ_TIMEOUT }}; + proxy_buffer_size {{ $.PROXY_BUFFER_SIZE }}; + proxy_buffering {{ $.PROXY_BUFFERING }}; + proxy_buffers {{ $.PROXY_BUFFERS }}; + proxy_busy_buffers_size {{ $.PROXY_BUSY_BUFFERS_SIZE }}; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For {{ $.PROXY_X_FORWARDED_FOR }}; + proxy_set_header X-Forwarded-Port {{ $.PROXY_X_FORWARDED_PORT }}; + proxy_set_header X-Forwarded-Proto {{ $.PROXY_X_FORWARDED_PROTO }}; + proxy_set_header X-Request-Start $msec; + {{ if $.PROXY_X_FORWARDED_SSL }}proxy_set_header X-Forwarded-Ssl {{ $.PROXY_X_FORWARDED_SSL }};{{ end }} + } + + {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }} + include {{ $.DOKKU_ROOT }}/{{ $.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 {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } + + error_page 404 /404-error.html; + location /404-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } + + error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; + location /500-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } +} + +{{ if $.DOKKU_APP_WEB_LISTENERS }} +{{ 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 }} + server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} +} +{{ end }}{{ end }} From 6830db2bc51905fe3ada0af01e71a174d66a8128 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Sep 2021 11:34:02 +0200 Subject: [PATCH 3/5] nginx.conf --- nginx.conf.sigil | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/nginx.conf.sigil b/nginx.conf.sigil index 0d6332b2..2ed9d21e 100644 --- a/nginx.conf.sigil +++ b/nginx.conf.sigil @@ -27,37 +27,6 @@ location / { proxy_set_header X-Forwarded-Port {{ $.PROXY_X_FORWARDED_PORT }}; proxy_set_header X-Forwarded-Proto {{ $.PROXY_X_FORWARDED_PROTO }}; proxy_set_header X-Request-Start $msec; - {{ if $.PROXY_X_FORWARDED_SSL }}proxy_set_header X-Forwarded-Ssl {{ $.PROXY_X_FORWARDED_SSL }};{{ end }} - } - - {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }} - include {{ $.DOKKU_ROOT }}/{{ $.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 {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } - - error_page 404 /404-error.html; - location /404-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } - - error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; - location /500-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } } -{{ if $.DOKKU_APP_WEB_LISTENERS }} -{{ 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 }} - server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} -} -{{ end }}{{ end }} +{{ end }} \ No newline at end of file From e620c20b34b6d721171e2d409c3bff6e13f2a037 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Sep 2021 11:50:51 +0200 Subject: [PATCH 4/5] nginx.conf --- nginx.conf.sigil | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nginx.conf.sigil b/nginx.conf.sigil index 2ed9d21e..9d5f7dc6 100644 --- a/nginx.conf.sigil +++ b/nginx.conf.sigil @@ -1,10 +1,14 @@ -{{ range $port_map := .PROXY_PORT_MAP | split " " }} -{{ $port_map_list := $port_map | split ":" }} +{{ $port_map := .PROXY_PORT_MAP | split " " }} +{{ $port_map_list := index $port_map 0 | split ":" }} {{ $scheme := index $port_map_list 0 }} {{ $listen_port := index $port_map_list 1 }} {{ $upstream_port := index $port_map_list 2 }} -location / { +{{ $listeners := index $.DOKKU_APP_WEB_LISTENERS 0 | split " " }} +{{ $listener_list := $listeners | split ":" }} +{{ $listener_ip := index $listener_list 0 }} + +location /graphql { gzip on; gzip_min_length 1100; @@ -13,7 +17,7 @@ location / { gzip_vary on; gzip_comp_level 6; - proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; + proxy_pass http://{{ $listener_ip }}:{{ $upstream_port }}; proxy_http_version 1.1; proxy_read_timeout {{ $.PROXY_READ_TIMEOUT }}; proxy_buffer_size {{ $.PROXY_BUFFER_SIZE }}; @@ -27,6 +31,4 @@ location / { proxy_set_header X-Forwarded-Port {{ $.PROXY_X_FORWARDED_PORT }}; proxy_set_header X-Forwarded-Proto {{ $.PROXY_X_FORWARDED_PROTO }}; proxy_set_header X-Request-Start $msec; -} - -{{ end }} \ No newline at end of file +} \ No newline at end of file From 900377d9764c74e5e988120f55d8c1770c479168 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Sep 2021 11:55:15 +0200 Subject: [PATCH 5/5] nginx.conf --- nginx.conf.sigil | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf.sigil b/nginx.conf.sigil index 9d5f7dc6..bff0869f 100644 --- a/nginx.conf.sigil +++ b/nginx.conf.sigil @@ -4,8 +4,8 @@ {{ $listen_port := index $port_map_list 1 }} {{ $upstream_port := index $port_map_list 2 }} -{{ $listeners := index $.DOKKU_APP_WEB_LISTENERS 0 | split " " }} -{{ $listener_list := $listeners | split ":" }} +{{ $listeners := $.DOKKU_APP_WEB_LISTENERS | split " " }} +{{ $listener_list := index $listeners 0 | split ":" }} {{ $listener_ip := index $listener_list 0 }} location /graphql {