From 8cd4adbd9c0ca2d4b7c88a6f89c576e4d636abb0 Mon Sep 17 00:00:00 2001
From: "Matt (IPv4) Cowley" <me@mattcowley.co.uk>
Date: Wed, 31 Mar 2021 14:14:40 +0100
Subject: [PATCH] Tweak sed commands in certbot setup (#240)

---
 src/nginxconfig/templates/setup_sections/certbot.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nginxconfig/templates/setup_sections/certbot.vue b/src/nginxconfig/templates/setup_sections/certbot.vue
index 472e33f..5d1ee66 100644
--- a/src/nginxconfig/templates/setup_sections/certbot.vue
+++ b/src/nginxconfig/templates/setup_sections/certbot.vue
@@ -33,7 +33,7 @@ THE SOFTWARE.
                     <br />
                 </p>
                 <BashPrism :key="sitesAvailable"
-                           :cmd="`sed -i -r 's/(listen .*443)/\\1;#/g; s/(ssl_(certificate|certificate_key|trusted_certificate) )/#;#\\1/g' ${sitesAvailable}`"
+                           :cmd="`sed -i -r 's/(listen .*443)/\\1; #/g; s/(ssl_(certificate|certificate_key|trusted_certificate) )/#;#\\1/g; s/(server \\{)/\\1\\n    ssl off;/g' ${sitesAvailable}`"
                            @copied="codeCopiedEvent('Disable ssl directives')"
                 ></BashPrism>
             </li>
@@ -65,7 +65,7 @@ THE SOFTWARE.
                     <br />
                 </p>
                 <BashPrism :key="sitesAvailable"
-                           :cmd="`sed -i -r 's/#?;#//g' ${sitesAvailable}`"
+                           :cmd="`sed -i -r -z 's/#?; ?#//g; s/(server \\{)\\n    ssl off;/\\1/g' ${sitesAvailable}`"
                            @copied="codeCopiedEvent('Enable ssl directives')"
                 ></BashPrism>
             </li>