FEATURE fix path to root CA file

plesk · May 8, 2024 · 97f17a2 · 97f17a2
1 parent c0bb014
commit 97f17a2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/wfe2/wfe.go b/wfe2/wfe.go
@@ -513,11 +513,15 @@ func (wfe *WebFrontEndImpl) CARoot(
 	logEvent *web.RequestEvent,
 	response http.ResponseWriter,
 	request *http.Request) {
+<<<<<<< HEAD
 <<<<<<< HEAD
 	filePath := "/hierarchy/root-cert-rsa.pem"
 =======
 	filePath := "/tmp/root-cert-rsa.pem"
 >>>>>>> 76f48f0b3 (Added ability to get Root CA content)
+=======
+	filePath := "/hierarchy/root-cert-rsa.pem"
+>>>>>>> 44e430f71 (FEATURE fix path to root CA file)
 	caRoot, err := ioutil.ReadFile(filePath)
 
 	if err != nil {