chore: remove autotls-storage-dir config option

Author: janos

cmd/bee/cmd/cmd.go

@@ -86,7 +86,6 @@ const (
 	optionNameP2PWSSEnable                 = "p2p-wss-enable"
 	optionP2PWSSAddr                       = "p2p-wss-addr"
 	optionNATWSSAddr                       = "nat-wss-addr"
-	optionAutoTLSStorageDir                = "autotls-storage-dir"
 	optionAutoTLSDomain                    = "autotls-domain"
 	optionAutoTLSRegistrationEndpoint      = "autotls-registration-endpoint"
 	optionAutoTLSCAEndpoint                = "autotls-ca-endpoint"
@@ -303,7 +302,6 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool(optionNameP2PWSSEnable, false, "Enable Secure WebSocket P2P connections")
 	cmd.Flags().String(optionP2PWSSAddr, ":1635", "p2p wss address")
 	cmd.Flags().String(optionNATWSSAddr, "", "WSS NAT exposed address")
-	cmd.Flags().String(optionAutoTLSStorageDir, "", "Data directory for certificate storage (default in p2p-tls-certs directory in storage dir)")
 	cmd.Flags().String(optionAutoTLSDomain, p2pforge.DefaultForgeDomain, "autotls domain")
 	cmd.Flags().String(optionAutoTLSRegistrationEndpoint, p2pforge.DefaultForgeEndpoint, "autotls registration endpoint")
 	cmd.Flags().String(optionAutoTLSCAEndpoint, p2pforge.DefaultCAEndpoint, "autotls certificate authority endpoint")

cmd/bee/cmd/start.go

@@ -277,18 +277,13 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		neighborhoodSuggester = c.config.GetString(optionNameNeighborhoodSuggester)
 	}
 
-	autoTLSStorageDir := c.config.GetString(optionAutoTLSStorageDir)
-	if autoTLSStorageDir == "" {
-		autoTLSStorageDir = filepath.Join(c.config.GetString(optionNameDataDir), "p2p-tls-certs")
-	}
-
 	b, err := node.NewBee(ctx, c.config.GetString(optionNameP2PAddr), signerConfig.publicKey, signerConfig.signer, networkID, logger, signerConfig.libp2pPrivateKey, signerConfig.pssPrivateKey, signerConfig.session, &node.Options{
 		Addr:                          c.config.GetString(optionNameP2PAddr),
 		AllowPrivateCIDRs:             c.config.GetBool(optionNameAllowPrivateCIDRs),
 		APIAddr:                       c.config.GetString(optionNameAPIAddr),
 		EnableWSS:                     c.config.GetBool(optionNameP2PWSSEnable),
 		WSSAddr:                       c.config.GetString(optionP2PWSSAddr),
-		AutoTLSStorageDir:             autoTLSStorageDir,
+		AutoTLSStorageDir:             filepath.Join(c.config.GetString(optionNameDataDir), "autotls"),
 		BlockchainRpcEndpoint:         c.config.GetString(optionNameBlockchainRpcEndpoint),
 		BlockProfile:                  c.config.GetBool(optionNamePProfBlock),
 		BlockTime:                     networkConfig.blockTime,

packaging/bee.yaml

@@ -126,8 +126,6 @@ password-file: "/var/lib/bee/password"
 # p2p-wss-addr: :1635
 ## WSS NAT exposed address
 # nat-wss-addr: ""
-## autotls certificate storage directory (default: ./p2p-tls-certs)
-# autotls-storage-dir: ""
 ## autotls domain (default: libp2p.direct)
 # autotls-domain: ""
 ## autotls registration endpoint (default: https://registration.libp2p.direct)

packaging/homebrew-amd64/bee.yaml

@@ -126,8 +126,6 @@ password-file: "/usr/local/var/lib/swarm-bee/password"
 # p2p-wss-addr: :1635
 ## WSS NAT exposed address
 # nat-wss-addr: ""
-## autotls certificate storage directory (default: ./p2p-tls-certs)
-# autotls-storage-dir: ""
 ## autotls domain (default: libp2p.direct)
 # autotls-domain: ""
 ## autotls registration endpoint (default: https://registration.libp2p.direct)

packaging/homebrew-arm64/bee.yaml

@@ -126,8 +126,6 @@ password-file: "/opt/homebrew/var/lib/swarm-bee/password"
 # p2p-wss-addr: :1635
 ## WSS NAT exposed address
 # nat-wss-addr: ""
-## autotls certificate storage directory (default: ./p2p-tls-certs)
-# autotls-storage-dir: ""
 ## autotls domain (default: libp2p.direct)
 # autotls-domain: ""
 ## autotls registration endpoint (default: https://registration.libp2p.direct)

packaging/scoop/bee.yaml

@@ -126,8 +126,6 @@ password-file: "./password"
 # p2p-wss-addr: :1635
 ## WSS NAT exposed address
 # nat-wss-addr: ""
-## autotls certificate storage directory (default: ./p2p-tls-certs)
-# autotls-storage-dir: ""
 ## autotls domain (default: libp2p.direct)
 # autotls-domain: ""
 ## autotls registration endpoint (default: https://registration.libp2p.direct)