Support disabling IPv6 notation

Author: ewoutp

main.go

@@ -86,6 +86,7 @@ var (
 	sslAutoOrganization      string
 	sslCAFile                string
 	rocksDBEncryptionKeyFile string
+	disableIPv6              bool
 	dockerEndpoint           string
 	dockerImage              string
 	dockerImagePullPolicy    string
@@ -115,6 +116,7 @@ func init() {
 	f.BoolVar(&allPortOffsetsUnique, "starter.unique-port-offsets", false, "If set, all peers will get a unique port offset. If false (default) only portOffset+peerAddress pairs will be unique.")
 	f.StringVar(&dataDir, "starter.data-dir", getEnvVar("DATA_DIR", "."), "directory to store all data the starter generates (and holds actual database directories)")
 	f.BoolVar(&debugCluster, "starter.debug-cluster", getEnvVar("DEBUG_CLUSTER", "") != "", "If set, log more information to debug a cluster")
+	f.BoolVar(&disableIPv6, "starter.disable-ipv6", false, "If set, no IPv6 notation will be used. Use this only when IPv6 address family is disabled")
 
 	f.BoolVar(&verbose, "log.verbose", false, "Turn on debug logging")
 
@@ -487,6 +489,7 @@ func mustPrepareService(generateAutoKeyFile bool) (*service.Service, service.Boo
 		SslKeyFile:               sslKeyFile,
 		SslCAFile:                sslCAFile,
 		RocksDBEncryptionKeyFile: rocksDBEncryptionKeyFile,
+		DisableIPv6:              disableIPv6,
 	}
 	bsCfg.Initialize()
 	serviceConfig := service.Config{

service/arangod_config_builder.go

@@ -84,11 +84,15 @@ func createArangodConf(log *logging.Logger, bsCfg BootstrapConfig, myHostDir, my
 		threads = "16"
 		v8Contexts = "4"
 	}
+	listenAddr := "[::]"
+	if bsCfg.DisableIPv6 {
+		listenAddr = "0.0.0.0"
+	}
 	scheme := NewURLSchemes(bsCfg.SslKeyFile != "").Arangod
 	serverSection := &configSection{
 		Name: "server",
 		Settings: map[string]string{
-			"endpoint":       fmt.Sprintf("%s://[::]:%s", scheme, myPort),
+			"endpoint":       fmt.Sprintf("%s://%s:%s", scheme, listenAddr, myPort),
 			"threads":        threads,
 			"authentication": "false",
 		},

service/bootstrap_config.go

@@ -39,6 +39,7 @@ type BootstrapConfig struct {
 	SslKeyFile               string      // Path containing an x509 certificate + private key to be used by the servers.
 	SslCAFile                string      // Path containing an x509 CA certificate used to authenticate clients.
 	RocksDBEncryptionKeyFile string      // Path containing encryption key for RocksDB encryption.
+	DisableIPv6              bool        // If set, no IPv6 notation will be used
 }
 
 // Initialize auto-configures some optional values