From ee3afcdbf4be253f36b07bc729d027a2bf9c8926 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 5 Sep 2018 00:01:27 +0000 Subject: [PATCH] remove duplicate ssl stuff thats overriding the proper config --- roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf | 4 ---- roles/ufmonitor/templates/ufmonitor.conf.j2 | 2 -- 2 files changed, 6 deletions(-) diff --git a/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf b/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf index 0d61a08504..399ddae75e 100644 --- a/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf +++ b/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf @@ -62,8 +62,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na SSLCertificateKeyFile /etc/letsencrypt/live/{{ external_hostname }}/privkey.pem SSLCertificateChainFile /etc/letsencrypt/live/{{ external_hostname }}/fullchain.pem SSLHonorCipherOrder On - SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL - SSLProtocol ALL -SSLv2 Alias /static /usr/lib/python2.7/site-packages/pagure/static/ @@ -125,8 +123,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na SSLCertificateKeyFile /etc/letsencrypt/live/{{ external_hostname }}/privkey.pem SSLCertificateChainFile /etc/letsencrypt/live/{{ external_hostname }}/fullchain.pem SSLHonorCipherOrder On - SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL - SSLProtocol ALL -SSLv2 # Configure static files so that a custom theme can override the defaults RewriteEngine on diff --git a/roles/ufmonitor/templates/ufmonitor.conf.j2 b/roles/ufmonitor/templates/ufmonitor.conf.j2 index 3e56041ac8..d0626f479f 100644 --- a/roles/ufmonitor/templates/ufmonitor.conf.j2 +++ b/roles/ufmonitor/templates/ufmonitor.conf.j2 @@ -25,8 +25,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/{{ external_hostname }}/privkey.pem SSLCertificateChainFile /etc/letsencrypt/live/{{ external_hostname }}/fullchain.pem SSLHonorCipherOrder On - SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL - SSLProtocol ALL -SSLv2 DocumentRoot "{{ ufmonitor_home }}"