- Fix create-envfile and uwsgi.ini proxy

Author: afabiani

.env.sample

@@ -41,7 +41,7 @@ BROKER_URL=amqp://guest:guest@rabbitmq:5672/
 CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=True
 
-SITEURL=http://{hostname}/
+SITEURL={siteurl}/
 
 ALLOWED_HOSTS="['django', '*', '{hostname}']"
 
@@ -67,6 +67,7 @@ JENKINS_HTTPS_PORT=9443
 # #################
 GEONODE_LB_HOST_IP={hostname}
 GEONODE_LB_PORT=80
+PUBLIC_PORT={public_port}
 
 # IP or domain name and port where the server can be reached on HTTPS (leave HOST empty if you want to use HTTP only)
 # port where the server can be reached on HTTPS
@@ -240,7 +241,7 @@ LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
 POSTGRESQL_MAX_CONNECTIONS=200
 
 # Common containers restart policy
-RESTART_POLICY_CONDITION="on-failure"      
+RESTART_POLICY_CONDITION="on-failure"
 RESTART_POLICY_DELAY="5s"
 RESTART_POLICY_MAX_ATTEMPTS="3"
 RESTART_POLICY_WINDOW=120s

.gitignore

@@ -64,4 +64,5 @@ local_settings.py
 .idea/
 .vscode/
 .vagrant/
-Vagrantfile
+Vagrantfile
+/.env

create-envfile.py

@@ -81,9 +81,11 @@ def _get_vals_to_replace(args):
         }
         tcp = 'https' if ast.literal_eval(f"{_jsfile.get('https', args.https)}".capitalize()) else 'http'
 
+        _vals_to_replace["public_port"] = '443' if ast.literal_eval(f"{_jsfile.get('https', args.https)}".capitalize()) else '80'
         _vals_to_replace["http_host"] = _jsfile.get("hostname", args.hostname) if tcp == 'http' else ""
         _vals_to_replace["https_host"] = _jsfile.get("hostname", args.hostname) if tcp == 'https' else ""
 
+        _vals_to_replace["siteurl"] = f"{tcp}://{_jsfile.get('hostname', args.hostname)}"
         _vals_to_replace["geoserver_ui"] = f"{tcp}://{_jsfile.get('hostname', args.hostname)}"
         _vals_to_replace["secret_key"] = _jsfile.get("secret_key",args.secret_key) or "".join(random.choice(_strong_chars) for _ in range(50))
         _vals_to_replace["letsencrypt_mode"] = "disabled" if not _vals_to_replace.get("https_host") else "production"

docker/nginx/geonode.conf.envsubst

@@ -140,6 +140,7 @@ location / {
   proxy_set_header            X-Forwarded-For $proxy_add_x_forwarded_for;
   proxy_set_header            X-Forwarded-Proto $scheme;
   proxy_hide_header           X-Frame-Options;
+  proxy_request_buffering     off;
 
   # uwsgi_params
   include /etc/nginx/uwsgi_params;
@@ -149,6 +150,7 @@ location / {
 
   # when a client closes the connection then keep the channel to uwsgi open. Otherwise uwsgi throws an IOError
   uwsgi_ignore_client_abort on;
+  uwsgi_request_buffering off;
 
   location ~* \.(?:js|jpg|jpeg|gif|png|tgz|gz|rar|bz2|doc|pdf|ppt|tar|wav|bmp|ttf|rtf|swf|ico|flv|woff|woff2|svg|xml)$ {
       gzip_static always;

src/uwsgi.ini

@@ -1,6 +1,6 @@
 [uwsgi]
-# socket = 0.0.0.0:8000
-http-socket = 0.0.0.0:8000
+socket = 0.0.0.0:8000
+# http-socket = 0.0.0.0:8000
 logto = /var/log/geonode.log
 # pidfile = /tmp/geonode.pid