From e9e7015ed7667352c1c191fc632a9f6f382dd9d2 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Fri, 18 Dec 2020 12:32:24 +0100
Subject: [PATCH]  Fix the caldav regex

---
 scripts/change_url | 2 +-
 scripts/install    | 2 +-
 scripts/restore    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index c779071..5cb1cb9 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -105,7 +105,7 @@ then
 		ynh_print_warn --message="Another app already uses the domain $domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book."
 
 		# Remove lines about .well-known/carddav and caldav with sed.
-		sed --in-place --regexp-extended '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' "/etc/nginx/conf.d/$new_domain.d/$app.conf"
+		sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "/etc/nginx/conf.d/$new_domain.d/$app.conf"
 		ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 	fi
 fi
diff --git a/scripts/install b/scripts/install
index d9a539a..1e1621d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -116,7 +116,7 @@ then
     ynh_print_warn --message="Another app already uses the domain $domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book."
 
     # Remove lines about .well-known/carddav and caldav with sed.
-    sed --in-place --regexp-extended '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' "../conf/nginx.conf"
+    sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "../conf/nginx.conf"
 fi
 
 # Create a dedicated NGINX config
diff --git a/scripts/restore b/scripts/restore
index 48fe654..44f8384 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -56,7 +56,7 @@ then
     ynh_print_warn --message="Another app already uses the domain $domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book."
 
     # Remove lines about .well-known/carddav and caldav with sed.
-    sed --in-place --regexp-extended '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' "/etc/nginx/conf.d/$domain.d/$app.conf"
+    sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
 
 #=================================================