diff options
| author | Wayne Witzel III <wayne@riotousliving.com> | 2016-10-07 16:50:30 +0200 |
|---|---|---|
| committer | Wayne Witzel III <wayne@riotousliving.com> | 2016-10-07 16:50:30 +0200 |
| commit | c64392eb676da42ef151a577d0379991b51d99e6 (patch) | |
| tree | 914731051de2017154ce21aacb624850a1a739cb | |
| parent | new configuration files for uwsgi/daphne (diff) | |
| download | awx-c64392eb676da42ef151a577d0379991b51d99e6.tar.xz awx-c64392eb676da42ef151a577d0379991b51d99e6.zip | |
removing old apache, renaming nginx config
| -rw-r--r-- | config/awx-httpd-443.conf | 50 | ||||
| -rw-r--r-- | config/awx-httpd-80.conf | 49 | ||||
| -rw-r--r-- | config/awx-nginx.conf (renamed from config/awx-nginx-80.conf) | 0 |
3 files changed, 0 insertions, 99 deletions
diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf deleted file mode 100644 index 2266f042c6..0000000000 --- a/config/awx-httpd-443.conf +++ /dev/null @@ -1,50 +0,0 @@ -NameVirtualHost *:443 -WSGISocketPrefix /var/run/wsgi -WSGIPythonHome /var/lib/awx/venv/tower - -# LoadModule ssl_module modules/mod_ssl.so - -<VirtualHost _default_:443> - ServerName localhost - ServerAlias * - DocumentRoot /var/lib/awx/public - SSLEngine on -# This certificate can be replaced. -# However, do not use a different name for, or path to, the SSL certificate. -# Tower's live events feature requires the SSL certificate to be in this location. - SSLCertificateFile /etc/tower/tower.cert - SSLCertificateKeyFile /etc/tower/tower.key - SSLProtocol all -SSLv3 -SSLv2 - - WSGIScriptAlias / /var/lib/awx/wsgi.py - WSGIPassAuthorization On - - WSGIDaemonProcess awx user=awx group=awx processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" - WSGIProcessGroup awx - - Alias /favicon.ico /var/lib/awx/public/static/favicon.ico - Alias /static/ /var/lib/awx/public/static/ - - <Directory /var/lib/awx/> - <Files wsgi.py> - <IfVersion >= 2.3> - Require all granted - </IfVersion> - <IfVersion < 2.3> - Order deny,allow - Allow from all - </IfVersion> - </Files> - </Directory> - - <Directory /var/lib/awx/public/> - <IfVersion >= 2.3> - Require all granted - </IfVersion> - <IfVersion < 2.3> - Order deny,allow - Allow from all - </IfVersion> - </Directory> - -</VirtualHost> diff --git a/config/awx-httpd-80.conf b/config/awx-httpd-80.conf deleted file mode 100644 index f1390fead3..0000000000 --- a/config/awx-httpd-80.conf +++ /dev/null @@ -1,49 +0,0 @@ -WSGISocketPrefix /var/run/wsgi -WSGIPythonHome /var/lib/awx/venv/tower - -<VirtualHost _default_:80> - - RewriteEngine On - # don't redirect HTTPs - RewriteCond %{HTTPS} off - # don't redirect /api traffic that requested explicit http:// - RewriteRule ^/api - [L] - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - - ServerName localhost - ServerAlias * - DocumentRoot /var/lib/awx/public - - WSGIScriptAlias / /var/lib/awx/wsgi.py - WSGIPassAuthorization On - - WSGIDaemonProcess awx_plain user=awx group=awx processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" - WSGIProcessGroup awx_plain - - Alias /favicon.ico /var/lib/awx/public/static/favicon.ico - Alias /static/ /var/lib/awx/public/static/ - - <Directory /var/lib/awx/> - <Files wsgi.py> - <IfVersion >= 2.3> - Require all granted - </IfVersion> - <IfVersion < 2.3> - Order deny,allow - Allow from all - </IfVersion> - </Files> - </Directory> - - <Directory /var/lib/awx/public/> - <IfVersion >= 2.3> - Require all granted - </IfVersion> - <IfVersion < 2.3> - Order deny,allow - Allow from all - </IfVersion> - </Directory> - - -</VirtualHost> diff --git a/config/awx-nginx-80.conf b/config/awx-nginx.conf index facaeae181..facaeae181 100644 --- a/config/awx-nginx-80.conf +++ b/config/awx-nginx.conf |