Support httpd 2.2 and 2.4 config formats

Create new-style debian apache-2.4 conf-enabled/ symlinks
This commit is contained in:
James Laska 2014-03-10 12:08:37 -04:00
parent 15a08232e0
commit 6a98afc649
3 changed files with 31 additions and 9 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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 = {