feat: add pubkey input and configure real ip header for strfry and strfry29 and update nostr-rs-relay, strfry, wot relay, and strfry29 database path

Author: jchiarulli

cmd/install.go

@@ -54,10 +54,12 @@ var installCmd = &cobra.Command{
 
 		var privKey string
 		var pubKey string
-		if selectedRelayOption == khatru_pyramid.RelayName || selectedRelayOption == nostr_rs_relay.RelayName || selectedRelayOption == wot_relay.RelayName {
+		if selectedRelayOption == khatru_pyramid.RelayName || selectedRelayOption == nostr_rs_relay.RelayName || selectedRelayOption == strfry.RelayName || selectedRelayOption == wot_relay.RelayName || selectedRelayOption == strfry29.RelayName {
 			pterm.Println()
 			pubKey, _ = pterm.DefaultInteractiveTextInput.Show("Public key (hex not npub)")
-		} else if selectedRelayOption == khatru29.RelayName || selectedRelayOption == strfry29.RelayName {
+		}
+
+		if selectedRelayOption == khatru29.RelayName || selectedRelayOption == strfry29.RelayName {
 			pterm.Println()
 			privKeyInput := pterm.DefaultInteractiveTextInput.WithMask("*")
 			privKey, _ = privKeyInput.Show("Private key (hex not nsec)")
@@ -160,7 +162,7 @@ var installCmd = &cobra.Command{
 			strfry.InstallRelayBinary()
 
 			// Step 10: Set up the relay service
-			strfry.SetupRelayService(relayDomain, relayContact)
+			strfry.SetupRelayService(relayDomain, pubKey, relayContact)
 
 			// Step 11: Show success messages
 			strfry.SuccessMessages(relayDomain, httpsEnabled)
@@ -217,7 +219,7 @@ var installCmd = &cobra.Command{
 			strfry29.InstallRelayBinary()
 
 			// Step 10: Set up the relay service
-			strfry29.SetupRelayService(relayDomain, privKey, relayContact)
+			strfry29.SetupRelayService(relayDomain, pubKey, privKey, relayContact)
 
 			// Step 11: Show success messages
 			strfry29.SuccessMessages(relayDomain, httpsEnabled)

pkg/relays/constants.go

@@ -2,5 +2,6 @@ package relays
 
 const BinaryDestDir = "/usr/local/bin"
 const TmpDirPath = "/tmp"
+const DBDir = "db"
 const User = "nostr"
 const NginxUser = "www-data"

pkg/relays/khatru29/constants.go

@@ -8,8 +8,8 @@ const DataDirPath = "/var/lib/khatru29"
 const ConfigDirPath = "/etc/khatru29"
 const ServiceName = "khatru29"
 const EnvFilePath = "/etc/khatru29/khatru29.env"
-const EnvFileTemplate = `PORT="5577"
-DOMAIN="{{.Domain}}"
+const EnvFileTemplate = `DOMAIN="{{.Domain}}"
+PORT="5577"
 RELAY_NAME="Khatru29"
 RELAY_PRIVKEY="{{.PrivKey}}"
 RELAY_DESCRIPTION="Khatru29 Relay"

pkg/relays/nostr_rs_relay/nginx_https.go

@@ -37,6 +37,7 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
         # First attempt to serve request as file, then
         # as directory, then fall back to displaying 404.
         try_files $uri $uri/ =404;

pkg/relays/nostr_rs_relay/service.go

@@ -17,7 +17,7 @@ func SetupRelayService(domain, pubKey, relayContact string, httpsEnabled bool) {
 	// Ensure the data directory exists and set permissions
 	spinner.UpdateText("Creating data directory...")
 	directories.CreateDirectory(DataDirPath, 0755)
-	directories.CreateDirectory(fmt.Sprintf("%s/db", DataDirPath), 0755)
+	directories.CreateDirectory(fmt.Sprintf("%s/%s", DataDirPath, relays.DBDir), 0755)
 
 	// Use chown command to set ownership of the data directory to the nostr user
 	directories.SetOwnerAndGroup(relays.User, relays.User, DataDirPath)
@@ -45,7 +45,7 @@ func SetupRelayService(domain, pubKey, relayContact string, httpsEnabled bool) {
 	files.InPlaceEdit(fmt.Sprintf(`s|#contact = ".*"|contact = "%s"|`, relayContact), TmpConfigFilePath)
 
 	// Construct the sed command to change the data directory
-	files.InPlaceEdit(fmt.Sprintf(`s|#data_directory = ".*"|data_directory = "%s"|`, DataDirPath), TmpConfigFilePath)
+	files.InPlaceEdit(fmt.Sprintf(`s|#data_directory = ".*"|data_directory = "%s/%s"|`, DataDirPath, relays.DBDir), TmpConfigFilePath)
 
 	// Construct the sed command to change the remote ip header
 	files.InPlaceEdit(fmt.Sprintf(`s|#remote_ip_header = "x-forwarded-for"|remote_ip_header = "x-forwarded-for"|`), TmpConfigFilePath)

pkg/relays/strfry/service.go

@@ -10,12 +10,13 @@ import (
 )
 
 // Function to set up the relay service
-func SetupRelayService(domain, relayContact string) {
+func SetupRelayService(domain, pubKey, relayContact string) {
 	spinner, _ := pterm.DefaultSpinner.Start("Configuring relay service...")
 
 	// Ensure the data directory exists and set permissions
 	spinner.UpdateText("Creating data directory...")
 	directories.CreateDirectory(DataDirPath, 0755)
+	directories.CreateDirectory(fmt.Sprintf("%s/%s", DataDirPath, relays.DBDir), 0755)
 
 	// Use chown command to set ownership of the data directory to the nostr user
 	directories.SetOwnerAndGroup(relays.User, relays.User, DataDirPath)
@@ -34,14 +35,20 @@ func SetupRelayService(domain, relayContact string) {
 	files.RemoveFile(ServiceFilePath)
 
 	// Construct the sed command to change the db path
-	files.InPlaceEdit(fmt.Sprintf(`s|db = ".*"|db = "%s"|`, DataDirPath), TmpConfigFilePath)
+	files.InPlaceEdit(fmt.Sprintf(`s|db = ".*"|db = "%s/%s"|`, DataDirPath, relays.DBDir), TmpConfigFilePath)
 
 	// Construct the sed command to change the nofiles limit
 	// TODO
 	// Determine system hard limit
 	// Determine preferred nofiles value
 	files.InPlaceEdit(`s|nofiles = .*|nofiles = 0|`, TmpConfigFilePath)
 
+	// Construct the sed command to change the realIpHeader
+	files.InPlaceEdit(`s|realIpHeader = .*|realIpHeader = "x-forwarded-for"|`, TmpConfigFilePath)
+
+	// Construct the sed command to change the pubkey
+	files.InPlaceEdit(fmt.Sprintf(`s|pubkey = .*|pubkey = "%s"|`, pubKey), TmpConfigFilePath)
+
 	// Construct the sed command to change the contact
 	files.InPlaceEdit(fmt.Sprintf(`s|contact = ".*"|contact = "%s"|`, relayContact), TmpConfigFilePath)
 

pkg/relays/strfry29/service.go

@@ -11,12 +11,13 @@ import (
 )
 
 // Function to set up the relay service
-func SetupRelayService(domain, relaySecretKey, relayContact string) {
+func SetupRelayService(domain, pubKey, relaySecretKey, relayContact string) {
 	spinner, _ := pterm.DefaultSpinner.Start("Configuring relay service...")
 
 	// Ensure the data directory exists and set permissions
 	spinner.UpdateText("Creating data directory...")
 	directories.CreateDirectory(DataDirPath, 0755)
+	directories.CreateDirectory(fmt.Sprintf("%s/%s", DataDirPath, relays.DBDir), 0755)
 
 	// Use chown command to set ownership of the data directory to the nostr user
 	directories.SetOwnerAndGroup(relays.User, relays.User, DataDirPath)
@@ -38,16 +39,22 @@ func SetupRelayService(domain, relaySecretKey, relayContact string) {
 	files.RemoveFile(ServiceFilePath)
 
 	// Construct the sed command to change the db path
-	files.InPlaceEdit(fmt.Sprintf(`s|db = ".*"|db = "%s"|`, DataDirPath), TmpConfigFilePath)
+	files.InPlaceEdit(fmt.Sprintf(`s|db = ".*"|db = "%s/%s"|`, DataDirPath, relays.DBDir), TmpConfigFilePath)
 
 	// TODO
 	// Determine system hard limit
 	// Determine preferred nofiles value
 	// Construct the sed command to change the nofiles limit
 
+	// Construct the sed command to change the realIpHeader
+	files.InPlaceEdit(`s|realIpHeader = .*|realIpHeader = "x-forwarded-for"|`, TmpConfigFilePath)
+
 	// Construct the sed command to change the info description
 	files.InPlaceEdit(fmt.Sprintf(`s|description = ".*"|description = "%s"|`, ConfigFileInfoDescription), TmpConfigFilePath)
 
+	// Construct the sed command to change the pubkey
+	files.InPlaceEdit(fmt.Sprintf(`s|pubkey = .*|pubkey = "%s"|`, pubKey), TmpConfigFilePath)
+
 	// Construct the sed command to change the contact
 	files.InPlaceEdit(fmt.Sprintf(`s|contact = ".*"|contact = "%s"|`, relayContact), TmpConfigFilePath)
 

pkg/relays/wot_relay/service.go

@@ -17,7 +17,7 @@ func SetupRelayService(domain, pubKey, relayContact string, httpsEnabled bool) {
 	// Ensure the data directory exists and set permissions
 	spinner.UpdateText("Creating data directory...")
 	directories.CreateDirectory(DataDirPath, 0755)
-	directories.CreateDirectory(fmt.Sprintf("%s/db", DataDirPath), 0755)
+	directories.CreateDirectory(fmt.Sprintf("%s/%s", DataDirPath, relays.DBDir), 0755)
 
 	// Use chown command to set ownership of the data directory and its content to the nostr user
 	directories.SetOwnerAndGroup(relays.User, relays.User, DataDirPath)