diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2015-02-02 00:39:49 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2015-02-02 00:39:49 +0000 |
| commit | a5d5bfff7f53d623739e7dce00a223abe24621c8 (patch) | |
| tree | ab74eb1d5eb8a861fbd8522efc1025543569abf8 | |
| parent | dca00f57fa629cd957bee3eefb697a9a774ece34 (diff) | |
| download | ansible-a5d5bfff7f53d623739e7dce00a223abe24621c8.tar.gz ansible-a5d5bfff7f53d623739e7dce00a223abe24621c8.tar.xz ansible-a5d5bfff7f53d623739e7dce00a223abe24621c8.zip | |
Try and make proxies not replace files twice and also fix el7 python hash hotfix.
| -rw-r--r-- | files/hotfix/httpd/httpd.sysconfig.el7 (renamed from roles/httpd/proxy/files/sysconfig-httpd) | 1 | ||||
| -rw-r--r-- | roles/httpd/proxy/tasks/main.yml | 11 | ||||
| -rw-r--r-- | tasks/apache.yml | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/roles/httpd/proxy/files/sysconfig-httpd b/files/hotfix/httpd/httpd.sysconfig.el7 index 345a7c424..25ee7cee3 100644 --- a/roles/httpd/proxy/files/sysconfig-httpd +++ b/files/hotfix/httpd/httpd.sysconfig.el7 @@ -1 +1,2 @@ export OPENSSL_NO_DEFAULT_ZLIB=1 +export PYTHONHASHSEED=random 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: |