From 9fceeec18ddacd9a55cba5c8c76c8f5eb5d0e536 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Thu, 19 Mar 2020 15:35:41 -0700 Subject: [PATCH] Revert test file to status in master. --- .../passing/two-blocks-one-line-1693.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/certbot-apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/certbot-apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf index 140bdeb0b..5d3cef423 100644 --- a/certbot-apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf +++ b/certbot-apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf @@ -3,18 +3,18 @@ ServerAdmin info@somethingnewentertainment.com ServerName somethingnewentertainment.com DocumentRoot /var/www/html - + ErrorLog /var/log/apache2/error.log CustomLog /var/log/apache2/access.log combined - + SSLEngine on SSLProtocol all -SSLv2 -SSLv3 SSLHonorCipherOrder on SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EEC DH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRS A RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4" - + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key - + SSLOptions +StdEnvVars @@ -25,5 +25,4 @@ nokeepalive ssl-unclean-shutdown \ downgrade-1.0 force-response-1.0 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - +