diff --git a/config/awx.conf b/config/awx-httpd-443.conf similarity index 70% rename from config/awx.conf rename to config/awx-httpd-443.conf index acc1e0c282..e74e19f199 100644 --- a/config/awx.conf +++ b/config/awx-httpd-443.conf @@ -1,6 +1,6 @@ NameVirtualHost *:443 WSGISocketPrefix /var/run/wsgi -LoadModule ssl_module modules/mod_ssl.so +# LoadModule ssl_module modules/mod_ssl.so ServerName localhost @@ -21,14 +21,24 @@ LoadModule ssl_module modules/mod_ssl.so - Order deny,allow - Allow from all + = 2.3> + Require all granted + + + Order deny,allow + Allow from all + - Order deny,allow - Allow from all + = 2.3> + Require all granted + + + Order deny,allow + Allow from all + diff --git a/config/awx-plain.conf b/config/awx-httpd-80.conf similarity index 76% rename from config/awx-plain.conf rename to config/awx-httpd-80.conf index 94c8f90e2f..bc4a9b2e8e 100644 --- a/config/awx-plain.conf +++ b/config/awx-httpd-80.conf @@ -24,14 +24,24 @@ WSGISocketPrefix /var/run/wsgi - Order deny,allow - Allow from all + = 2.3> + Require all granted + + + Order deny,allow + Allow from all + - Order deny,allow - Allow from all + = 2.3> + Require all granted + + + Order deny,allow + Allow from all + diff --git a/setup.py b/setup.py index 7e3284d4e2..d0a1801059 100755 --- a/setup.py +++ b/setup.py @@ -143,7 +143,9 @@ setup( ("%s" % homedir, ["config/wsgi.py", "awx/static/favicon.ico", ]), - ("%s" % webconfig, ["config/awx.conf","config/awx-plain.conf"]), + ("%s" % webconfig, ["config/awx-httpd-80.conf", + "config/awx-httpd-443.conf", + ]), ] ), options = {