From a5d5bfff7f53d623739e7dce00a223abe24621c8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 2 Feb 2015 00:39:49 +0000
Subject: Try and make proxies not replace files twice and also fix el7 python
 hash hotfix.

---
 files/hotfix/httpd/httpd.sysconfig.el7  |  2 ++
 roles/httpd/proxy/files/sysconfig-httpd |  1 -
 roles/httpd/proxy/tasks/main.yml        | 11 -----------
 tasks/apache.yml                        | 13 ++++++++++++-
 4 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 files/hotfix/httpd/httpd.sysconfig.el7
 delete mode 100644 roles/httpd/proxy/files/sysconfig-httpd

diff --git a/files/hotfix/httpd/httpd.sysconfig.el7 b/files/hotfix/httpd/httpd.sysconfig.el7
new file mode 100644
index 000000000..25ee7cee3
--- /dev/null
+++ b/files/hotfix/httpd/httpd.sysconfig.el7
@@ -0,0 +1,2 @@
+export OPENSSL_NO_DEFAULT_ZLIB=1
+export PYTHONHASHSEED=random
diff --git a/roles/httpd/proxy/files/sysconfig-httpd b/roles/httpd/proxy/files/sysconfig-httpd
deleted file mode 100644
index 345a7c424..000000000
--- a/roles/httpd/proxy/files/sysconfig-httpd
+++ /dev/null
@@ -1 +0,0 @@
-export OPENSSL_NO_DEFAULT_ZLIB=1
diff --git a/roles/httpd/proxy/tasks/main.yml b/roles/httpd/proxy/tasks/main.yml
index 99d6a500b..15f37baf8 100644
--- a/roles/httpd/proxy/tasks/main.yml
+++ b/roles/httpd/proxy/tasks/main.yml
@@ -24,17 +24,6 @@
   - forwarded.conf
   - 00-namevirtualhost.conf
   - 01-keepalives.conf
-  - headers.conf
-  notify:
-  - restart httpd
-  tags:
-  - httpd
-  - httpd/proxy
-
-- name: And, copy in /etc/sysconfig/httpd
-  copy: >
-    src=sysconfig-httpd dest=/etc/sysconfig/httpd
-    owner=root group=root mode=0644
   notify:
   - restart httpd
   tags:
diff --git a/tasks/apache.yml b/tasks/apache.yml
index 208088413..1b941a98e 100644
--- a/tasks/apache.yml
+++ b/tasks/apache.yml
@@ -29,8 +29,19 @@
   - hotfix
   - apache
 
-- name: hotfix - copy over new httpd sysconfig
+- name: hotfix - copy over new httpd sysconfig (el6)
   copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd
+  when: ansible_distribution_major_version == '6'
+  notify:
+  - restart apache
+  tags:
+  - config
+  - hotfix
+  - apache
+
+- name: hotfix - copy over new httpd sysconfig (el7)
+  copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd
+  when: ansible_distribution_major_version == '7'
   notify:
   - restart apache
   tags:
-- 
cgit