MEDIUM: add new server/bind options

Added: - server <name> <addr> pool-conn-name +1 - server <name> <addr> hash-key +1 - bind <addr> ssl default-crt +1
haproxytech · Jun 24, 2024 · c75eaad · c75eaad
1 parent 9ef3696
commit c75eaad
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/params/bind-options.go b/params/bind-options.go
@@ -218,6 +218,7 @@ func getBindOptions() []BindOption {
 		&BindOptionValue{Name: "quic-socket"},
 		&BindOptionValue{Name: "nbconn"},
 		&BindOptionValue{Name: "guid-prefix"},
+		&BindOptionValue{Name: "default-crt"},
 	}
 }
 

diff --git a/params/server-options.go b/params/server-options.go
@@ -267,6 +267,8 @@ func getServerOptions() []ServerOption {
 		&ServerOptionValue{Name: "log-bufsize"},
 		&ServerOptionValue{Name: "guid"},
 		&ServerOptionIDValue{Name: "set-proxy-v2-tlv-fmt"},
+		&ServerOptionValue{Name: "pool-conn-name"},
+		&ServerOptionValue{Name: "hash-key"},
 	}
 }
 

diff --git a/tests/bind_generated_test.go b/tests/bind_generated_test.go
diff --git a/tests/configs/haproxy_generated.cfg.go b/tests/configs/haproxy_generated.cfg.go
diff --git a/tests/integration/frontend_data_test.go b/tests/integration/frontend_data_test.go
diff --git a/tests/integration/frontend_test.go b/tests/integration/frontend_test.go
diff --git a/types/types.go b/types/types.go
@@ -259,6 +259,7 @@ type ACL struct {
 //test:ok:bind :443 nbconn 1
 //test:ok:bind :443 nbconn +2
 //test:ok:bind :443 guid-prefix guid-example
+//test:ok:bind :443 default-crt foobar.pem.rsa default-crt foobar.pem.ecdsa
 type Bind struct {
 	Path    string // can be address:port or socket path
 	Params  []params.BindOption