diff options
| author | James Laska <jlaska@ansible.com> | 2014-03-10 17:08:37 +0100 |
|---|---|---|
| committer | James Laska <jlaska@ansible.com> | 2014-03-10 20:47:10 +0100 |
| commit | 6a98afc64962aadcf4390c80a0cedd9e9f92f310 (patch) | |
| tree | 9afba3c75c33afac27af3a20f0c849df71833aaf /config | |
| parent | Clean up. Removed grey background from forms appearing inside accordions. Fix... (diff) | |
| download | awx-6a98afc64962aadcf4390c80a0cedd9e9f92f310.tar.xz awx-6a98afc64962aadcf4390c80a0cedd9e9f92f310.zip | |
Support httpd 2.2 and 2.4 config formats
Create new-style debian apache-2.4 conf-enabled/ symlinks
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-httpd-443.conf (renamed from config/awx.conf) | 18 | ||||
| -rw-r--r-- | config/awx-httpd-80.conf (renamed from config/awx-plain.conf) | 18 |
2 files changed, 28 insertions, 8 deletions
diff --git a/config/awx.conf b/config/awx-httpd-443.conf index acc1e0c282..e88c9ad9cc 100644 --- a/config/awx.conf +++ b/config/awx-httpd-443.conf @@ -21,14 +21,24 @@ LoadModule ssl_module modules/mod_ssl.so <Directory /var/lib/awx/> <Files wsgi.py> - Order deny,allow - Allow from all + <IfVersion >= 2.3> + Require all granted + </IfVersion> + <IfVersion < 2.3> + Order deny,allow + Allow from all + </IfVersion> </Files> </Directory> <Directory /var/lib/awx/public/> - Order deny,allow - Allow from all + <IfVersion >= 2.3> + Require all granted + </IfVersion> + <IfVersion < 2.3> + Order deny,allow + Allow from all + </IfVersion> </Directory> </VirtualHost> diff --git a/config/awx-plain.conf b/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 <Directory /var/lib/awx/> <Files wsgi.py> - Order deny,allow - Allow from all + <IfVersion >= 2.3> + Require all granted + </IfVersion> + <IfVersion < 2.3> + Order deny,allow + Allow from all + </IfVersion> </Files> </Directory> <Directory /var/lib/awx/public/> - Order deny,allow - Allow from all + <IfVersion >= 2.3> + Require all granted + </IfVersion> + <IfVersion < 2.3> + Order deny,allow + Allow from all + </IfVersion> </Directory> |