From b143f538888584a40ab6d7cfe91c6eb175178958 Mon Sep 17 00:00:00 2001
From: Graham Mainwaring <gmainwaring@ansible.com>
Date: Mon, 24 Oct 2016 18:50:08 +0000
Subject: [PATCH] Fix RPM builds and setup for 3.1

---
 config/awx-nginx.conf      | 2 +-
 tools/scripts/tower-python | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/config/awx-nginx.conf b/config/awx-nginx.conf
index 6089cb7a3c..3df3155ec8 100644
--- a/config/awx-nginx.conf
+++ b/config/awx-nginx.conf
@@ -48,7 +48,7 @@ http {
         server_name _;
         keepalive_timeout 70;
 
-        ssl_certificate /etc/tower/tower.crt;
+        ssl_certificate /etc/tower/tower.cert;
         ssl_certificate_key /etc/tower/tower.key;
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
diff --git a/tools/scripts/tower-python b/tools/scripts/tower-python
index 3e94c3a59b..d96abe967f 100755
--- a/tools/scripts/tower-python
+++ b/tools/scripts/tower-python
@@ -1,14 +1,5 @@
 #!/bin/bash
 
-# Enable needed Software Collections, if installed
-for scl in python27 httpd24; do
-  if [ -f /etc/scl/prefixes/$scl ]; then
-    if [ -f `cat /etc/scl/prefixes/$scl`/$scl/enable ]; then
-      . `cat /etc/scl/prefixes/$scl`/$scl/enable
-    fi
-  fi
-done
-
 # Enable Tower virtualenv
 if [ -f /var/lib/awx/venv/tower/bin/activate ]; then
   . /var/lib/awx/venv/tower/bin/activate