bugfix for renew cert

Hanabi-Live · Nov 1, 2020 · e43e4ae · e43e4ae
1 parent 0b832f1
commit e43e4ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/renew_cert.sh b/renew_cert.sh
@@ -5,4 +5,4 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 cd "$DIR"
-certbot renew
+certbot renew --webroot --webroot-path "$DIR/letsencrypt"
diff --git a/server/src/http.go b/server/src/http.go
@@ -269,18 +269,20 @@ func httpInit() {
 		// Create the LetsEncrypt directory structure
 		// (CertBot will look for data in "/.well-known/acme-challenge/####")
 		letsEncryptPath := path.Join(projectPath, "letsencrypt")
-		wellKnownPath := path.Join(letsEncryptPath, ".well-known")
-		acmeChallengePath := path.Join(wellKnownPath, "acme-challenge")
 		if _, err := os.Stat(letsEncryptPath); os.IsNotExist(err) {
-			if err := os.MkdirAll(acmeChallengePath, 0755); err != nil {
-				logger.Fatal("Failed to create the \""+acmeChallengePath+"\" directory:", err)
+			if err := os.MkdirAll(letsEncryptPath, 0755); err != nil {
+				logger.Fatal("Failed to create the \""+letsEncryptPath+"\" directory:", err)
 			}
 		}
+
+		wellKnownPath := path.Join(letsEncryptPath, ".well-known")
 		if _, err := os.Stat(wellKnownPath); os.IsNotExist(err) {
-			if err := os.MkdirAll(acmeChallengePath, 0755); err != nil {
-				logger.Fatal("Failed to create the \""+acmeChallengePath+"\" directory:", err)
+			if err := os.MkdirAll(wellKnownPath, 0755); err != nil {
+				logger.Fatal("Failed to create the \""+wellKnownPath+"\" directory:", err)
 			}
 		}
+
+		acmeChallengePath := path.Join(wellKnownPath, "acme-challenge")
 		if _, err := os.Stat(acmeChallengePath); os.IsNotExist(err) {
 			if err := os.MkdirAll(acmeChallengePath, 0755); err != nil {
 				logger.Fatal("Failed to create the \""+acmeChallengePath+"\" directory:", err)