shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Merge pull request #9 from jlaska/trusty_support

Browse Source 
Add Ubuntu-14.04 Trusty support
This commit is contained in:
James Laska 2014-03-10 15:59:18 -04:00
commit 8960f17f28
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/awx.conf → config/awx-httpd-443.conf
View File

@ -1,6 +1,6 @@
NameVirtualHost *:443 NameVirtualHost *:443
WSGISocketPrefix /var/run/wsgi WSGISocketPrefix /var/run/wsgi
LoadModule ssl_module modules/mod_ssl.so # LoadModule ssl_module modules/mod_ssl.so
<VirtualHost _default_:443> <VirtualHost _default_:443>
ServerName localhost ServerName localhost
@ -21,14 +21,24 @@ LoadModule ssl_module modules/mod_ssl.so
<Directory /var/lib/awx/> <Directory /var/lib/awx/>
<Files wsgi.py> <Files wsgi.py>
Order deny,allow <IfVersion >= 2.3>
Allow from all Require all granted
</IfVersion>
<IfVersion < 2.3>
Order deny,allow
Allow from all
</IfVersion>
</Files> </Files>
</Directory> </Directory>
<Directory /var/lib/awx/public/> <Directory /var/lib/awx/public/>
Order deny,allow <IfVersion >= 2.3>
Allow from all Require all granted
</IfVersion>
<IfVersion < 2.3>
Order deny,allow
Allow from all
</IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>

18
config/awx-plain.conf → config/awx-httpd-80.conf
View File

@ -24,14 +24,24 @@ WSGISocketPrefix /var/run/wsgi
<Directory /var/lib/awx/> <Directory /var/lib/awx/>
<Files wsgi.py> <Files wsgi.py>
Order deny,allow <IfVersion >= 2.3>
Allow from all Require all granted
</IfVersion>
<IfVersion < 2.3>
Order deny,allow
Allow from all
</IfVersion>
</Files> </Files>
</Directory> </Directory>
<Directory /var/lib/awx/public/> <Directory /var/lib/awx/public/>
Order deny,allow <IfVersion >= 2.3>
Allow from all Require all granted
</IfVersion>
<IfVersion < 2.3>
Order deny,allow
Allow from all
</IfVersion>
</Directory> </Directory>

4
setup.py
View File

@ -143,7 +143,9 @@ setup(
("%s" % homedir, ["config/wsgi.py", ("%s" % homedir, ["config/wsgi.py",
"awx/static/favicon.ico", "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 = { options = {