From c64392eb676da42ef151a577d0379991b51d99e6 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Fri, 7 Oct 2016 10:50:30 -0400
Subject: [PATCH] removing old apache, renaming nginx config

---
 config/awx-httpd-443.conf                    | 50 --------------------
 config/awx-httpd-80.conf                     | 49 -------------------
 config/{awx-nginx-80.conf => awx-nginx.conf} |  0
 3 files changed, 99 deletions(-)
 delete mode 100644 config/awx-httpd-443.conf
 delete mode 100644 config/awx-httpd-80.conf
 rename config/{awx-nginx-80.conf => awx-nginx.conf} (100%)

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
similarity index 100%
rename from config/awx-nginx-80.conf
rename to config/awx-nginx.conf