allow installer to get cert without email

nodetec · Jun 23, 2024 · eb41bc8 · eb41bc8
1 parent 0f68e3f
commit eb41bc8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/cmd/install.go b/cmd/install.go
@@ -19,7 +19,10 @@ var installCmd = &cobra.Command{
 		ui.Greet()
 
 		relayDomain, _ := pterm.DefaultInteractiveTextInput.Show("Relay domain name")
-		email, _ := pterm.DefaultInteractiveTextInput.Show("Email address")
+		pterm.Println()
+		pterm.Println(pterm.Yellow("Leave email empty if you don't want to receive notifications from Let's Encrypt about your SSL cert."))
+		pterm.Println()
+		ssl_email, _ := pterm.DefaultInteractiveTextInput.Show("Email address")
 		pubkey, _ := pterm.DefaultInteractiveTextInput.Show("Public key (hex not npub)")
 
 		pterm.Println()
@@ -36,7 +39,7 @@ var installCmd = &cobra.Command{
 		network.ConfigureNginxHttp(relayDomain)
 
 		// Step 4: Get SSL certificates
-		var shouldContinue = network.GetCertificates(relayDomain, email)
+		var shouldContinue = network.GetCertificates(relayDomain, ssl_email)
 
 		if !shouldContinue {
 			return
@@ -55,6 +58,7 @@ var installCmd = &cobra.Command{
 		pterm.Println(pterm.Magenta("The installation is complete."))
 		pterm.Println(pterm.Magenta("You can access your relay at wss://" + relayDomain))
 		pterm.Println()
+		pterm.Println(pterm.Magenta("You can re-run this installer with `relaywiz install`."))
 	},
 }
 

diff --git a/pkg/network/certbot.go b/pkg/network/certbot.go
@@ -17,11 +17,11 @@ func GetCertificates(domainName, email string) bool {
 
 	prompt := pterm.DefaultInteractiveContinue.WithOptions(options)
 
-  pterm.Println()
+	pterm.Println()
 	pterm.Println(pterm.Cyan("Do you want to obtain SSL certificates using Certbot?"))
 	pterm.Println(pterm.Cyan("This step requires that you already have a configured domain name."))
 	pterm.Println(pterm.Cyan("You can always re-run this installer after you have configured your domain name."))
-  pterm.Println()
+	pterm.Println()
 
 	result, _ := prompt.Show()
 
@@ -48,10 +48,18 @@ func GetCertificates(domainName, email string) bool {
 	}
 
 	spinner.UpdateText("Obtaining SSL certificates...")
-	cmd := exec.Command("certbot", "certonly", "--webroot", "-w", fmt.Sprintf("/var/www/%s", dirName), "-d", domainName, "--email", email, "--agree-tos", "--no-eff-email", "-q")
-	err = cmd.Run()
-	if err != nil {
-		log.Fatalf("Certbot failed to obtain the certificate for %s: %v", domainName, err)
+	if email == "" {
+		cmd := exec.Command("certbot", "certonly", "--webroot", "-w", fmt.Sprintf("/var/www/%s", dirName), "-d", domainName, "--agree-tos", "--no-eff-email", "-q", "--register-unsafely-without-email")
+		err = cmd.Run()
+		if err != nil {
+			log.Fatalf("Certbot failed to obtain the certificate for %s: %v", domainName, err)
+		}
+	} else {
+		cmd := exec.Command("certbot", "certonly", "--webroot", "-w", fmt.Sprintf("/var/www/%s", dirName), "-d", domainName, "--email", email, "--agree-tos", "--no-eff-email", "-q")
+		err = cmd.Run()
+		if err != nil {
+			log.Fatalf("Certbot failed to obtain the certificate for %s: %v", domainName, err)
+		}
 	}
 
 	spinner.Success("SSL certificates obtained successfully.")