copy nginx config and uwsgi_params

This commit is contained in:
Wayne Witzel III
2016-10-07 14:41:34 -04:00
parent c64392eb67
commit e4e878d041
2 changed files with 18 additions and 13 deletions

View File

@@ -59,15 +59,18 @@ http {
} }
location / { location / {
proxy_pass http://uwsgi; uwsgi_pass uwsgi;
proxy_http_version 1.1; include /etc/nginx/uwsgi_params;
proxy_buffering off;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_pass http://uwsgi;
proxy_set_header X-Forwarded-Proto https; #proxy_http_version 1.1;
proxy_set_header Host $http_host; #proxy_buffering off;
proxy_redirect off; #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade; #proxy_set_header X-Forwarded-Proto https;
proxy_set_header Connection $connection_upgrade; #proxy_set_header Host $http_host;
#proxy_redirect off;
#proxy_set_header Upgrade $http_upgrade;
#proxy_set_header Connection $connection_upgrade;
} }
} }
} }

View File

@@ -25,14 +25,16 @@ docdir = "/usr/share/doc/ansible-tower"
if os.path.exists("/etc/debian_version"): if os.path.exists("/etc/debian_version"):
sysinit = "/etc/init.d" sysinit = "/etc/init.d"
webconfig = "/etc/apache2/conf.d" webconfig = "/etc/nginx"
siteconfig = "/etc/nginx/sites-enabled"
# sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins' # sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins'
# sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins' # sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins'
# debian/<package>.links will create symlinks to support both versions # debian/<package>.links will create symlinks to support both versions
sosconfig = "/usr/share/sosreport/sos/plugins" sosconfig = "/usr/share/sosreport/sos/plugins"
else: else:
sysinit = "/etc/rc.d/init.d" sysinit = "/etc/rc.d/init.d"
webconfig = "/etc/httpd/conf.d" webconfig = "/etc/nginx"
siteconfig = "/etc/nginx/sites-enabled"
# The .spec will create symlinks to support multiple versions of sosreport # The .spec will create symlinks to support multiple versions of sosreport
sosconfig = "/usr/share/sosreport/sos/plugins" sosconfig = "/usr/share/sosreport/sos/plugins"
@@ -114,8 +116,8 @@ setup(
data_files = proc_data_files([ data_files = proc_data_files([
("%s" % homedir, ["config/wsgi.py", ("%s" % homedir, ["config/wsgi.py",
"awx/static/favicon.ico"]), "awx/static/favicon.ico"]),
("%s" % webconfig, ["config/awx-httpd-80.conf", ("%s" % siteconfig, ["config/awx-nginx.conf"]),
"config/awx-httpd-443.conf"]), ("%s" % webconfig, ["config/uwsgi_params"]),
("%s" % sharedir, ["tools/scripts/request_tower_configuration.sh","tools/scripts/request_tower_configuration.ps1"]), ("%s" % sharedir, ["tools/scripts/request_tower_configuration.sh","tools/scripts/request_tower_configuration.ps1"]),
("%s" % docdir, ["docs/licenses/*",]), ("%s" % docdir, ["docs/licenses/*",]),
("%s" % bindir, ["tools/scripts/ansible-tower-service", ("%s" % bindir, ["tools/scripts/ansible-tower-service",