Merge remote-tracking branch 'tower/release_3.3.0' into devel

installer/roles/image_build/files/nginx.conf

@@ -58,7 +58,7 @@ http {
 
         location /favicon.ico { alias /var/lib/awx/public/static/favicon.ico; }
 
-        location ~ ^/(websocket|network_ui/topology/) {
+        location /websocket {
             # Pass request to the upstream alias
             proxy_pass http://daphne;
             # Require http version 1.1 to allow for upgrade requests
@@ -86,6 +86,7 @@ http {
             uwsgi_read_timeout 120s;
             uwsgi_pass uwsgi;
             include /etc/nginx/uwsgi_params;
+            proxy_set_header X-Forwarded-Port 443;
         }
     }
 }

installer/roles/image_build/files/settings.py

@@ -108,3 +108,5 @@ CACHES = {
         'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
     },
 }
+
+USE_X_FORWARDED_PORT = True

installer/roles/image_build/files/supervisor_task.conf

@@ -15,6 +15,18 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
+[program:celery-watcher]
+command = /usr/bin/awx-manage watch_celery
+directory = /var/lib/awx
+environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8"
+autostart = true
+autorestart = true
+stopwaitsecs = 5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
 [program:callback-receiver]
 command = awx-manage run_callback_receiver
 directory = /var/lib/awx
@@ -38,7 +50,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [group:tower-processes]
-programs=celery,callback-receiver,channels-worker
+programs=celery,celery-watcher,callback-receiver,channels-worker
 priority=5
 
 # TODO: Exit Handler