Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Revert container-internal communication when using IPv6 (#21260)

Browse Source 
This reverts commit b3dbd85dbe.

This causes NGINX to fail to start if IPv6 is not available on the
system.
This commit is contained in:
Shrikant Sharat Kandula 2023-03-08 21:03:46 +05:30 committed by GitHub
parent 0ad5aaa41d
commit 43656a3714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/docker/templates/nginx-app-http.conf.template
View File

@ -1,6 +1,5 @@
server { server {
listen 80; listen 80;
listen [::]:80;
server_name $APPSMITH_DOMAIN; server_name $APPSMITH_DOMAIN;
client_max_body_size 150m; client_max_body_size 150m;

2
app/client/docker/templates/nginx-app-https.conf.template
View File

@ -1,6 +1,5 @@
server { server {
listen 80; listen 80;
listen [::]:80;
server_name $APPSMITH_DOMAIN; server_name $APPSMITH_DOMAIN;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
@ -8,7 +7,6 @@ server {
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name _; server_name _;
ssl_certificate ${APPSMITH_SSL_CERT_PATH}; ssl_certificate ${APPSMITH_SSL_CERT_PATH};

2
app/client/docker/templates/nginx-app.conf.template
View File

@ -1,6 +1,5 @@
server { server {
listen 80; listen 80;
listen [::]:80;
server_name dev.appsmith.com; server_name dev.appsmith.com;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
@ -8,7 +7,6 @@ server {
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name dev.appsmith.com; server_name dev.appsmith.com;
client_max_body_size 150m; client_max_body_size 150m;

3
app/client/start-https.sh
View File

@ -233,7 +233,6 @@ http {
$(if [[ $use_https == 1 ]]; then echo " $(if [[ $use_https == 1 ]]; then echo "
server { server {
listen $http_listen_port default_server; listen $http_listen_port default_server;
listen [::]:$http_listen_port default_server;
server_name $domain; server_name $domain;
return 301 https://\$host$(if [[ $https_listen_port != 443 ]]; then echo ":$https_listen_port"; fi)\$request_uri; return 301 https://\$host$(if [[ $https_listen_port != 443 ]]; then echo ":$https_listen_port"; fi)\$request_uri;
} }
@ -242,13 +241,11 @@ $(if [[ $use_https == 1 ]]; then echo "
server { server {
$(if [[ $use_https == 1 ]]; then echo " $(if [[ $use_https == 1 ]]; then echo "
listen $https_listen_port ssl http2 default_server; listen $https_listen_port ssl http2 default_server;
listen [::]:$https_listen_port ssl http2 default_server;
server_name $domain; server_name $domain;
ssl_certificate '$cert_file'; ssl_certificate '$cert_file';
ssl_certificate_key '$key_file'; ssl_certificate_key '$key_file';
"; else echo " "; else echo "
listen $http_listen_port default_server; listen $http_listen_port default_server;
listen [::]:$http_listen_port default_server;
server_name _; server_name _;
"; fi) "; fi)

1
deploy/docker/templates/nginx/nginx-app-http.conf.template.sh
View File

@ -24,7 +24,6 @@ access_log /dev/stdout;
server { server {
listen ${PORT:-80} default_server; listen ${PORT:-80} default_server;
listen [::]:${PORT:-80} default_server;
server_name $CUSTOM_DOMAIN; server_name $CUSTOM_DOMAIN;
client_max_body_size 150m; client_max_body_size 150m;

2
deploy/docker/templates/nginx/nginx-app-https.conf.template.sh
View File

@ -30,7 +30,6 @@ access_log /dev/stdout;
server { server {
listen 80; listen 80;
listen [::]:80;
server_name $CUSTOM_DOMAIN; server_name $CUSTOM_DOMAIN;
return 301 https://\$host\$request_uri; return 301 https://\$host\$request_uri;
@ -38,7 +37,6 @@ server {
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name _; server_name _;
ssl_certificate $SSL_CERT_PATH; ssl_certificate $SSL_CERT_PATH;