diff --git a/net/dataplaneapi/Makefile b/net/dataplaneapi/Makefile index 41b570a1497b..73f73b2fdb69 100644 --- a/net/dataplaneapi/Makefile +++ b/net/dataplaneapi/Makefile @@ -1,54 +1,54 @@ PORTNAME= dataplaneapi DISTVERSIONPREFIX= v -DISTVERSION= 3.3.5 +DISTVERSION= 3.4.0 CATEGORIES= net MAINTAINER= dtxdf@FreeBSD.org COMMENT= HAProxy Data Plane API WWW= https://github.com/haproxytech/dataplaneapi LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:1.26+,modules USE_GITHUB= yes GH_ACCOUNT= haproxytech USE_RC_SUBR= ${PORTNAME} GO_MOD_DIST= github GO_MODULE= github.com/haproxytech/${PORTNAME} GO_TARGET= ./cmd/${PORTNAME} GO_BUILDFLAGS= -ldflags "\ -X 'main.GitRepo=https://github.com/haproxytech/${PORTNAME}' \ -X 'main.GitTag=${DISTVERSIONPREFIX}${DISTVERSION}' \ -X 'main.GitCommit=${GITID}' \ -X 'main.BuildTime=${BUILD_DATE}'" PLIST_FILES= "@sample(,,640) etc/dataplaneapi.yaml.sample" \ bin/${PORTNAME} PORTDOCS= CONFIG.md README.md OPTIONS_DEFINE= DOCS # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse --short HEAD' # in the Data Plane API repository to get the value of GITID. -GITID= 8467a253 +GITID= f314b6be BUILD_DATE= $$(date -u "+%Y-%m-%dT%H:%M:%SZ") post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/configuration/configuration.go post-install: ${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/dataplaneapi.yaml \ > ${STAGEDIR}${PREFIX}/etc/dataplaneapi.yaml.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/configuration/doc/README.md ${STAGEDIR}${DOCSDIR}/CONFIG.md .include diff --git a/net/dataplaneapi/distinfo b/net/dataplaneapi/distinfo index c9a440107838..392ea7a3a4c7 100644 --- a/net/dataplaneapi/distinfo +++ b/net/dataplaneapi/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1780532125 -SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.3.5_GH0/go.mod) = b208b44861e4f121abe6a0f5742a5469c88dc8b3ae643c77cc5b98ec3d5d484a -SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.3.5_GH0/go.mod) = 8453 -SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.3.5_GH0/haproxytech-dataplaneapi-v3.3.5_GH0.tar.gz) = 7e9d0a97571fba51969cd28efd1fcde28e3757457a62d3f2c6861659060a2877 -SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.3.5_GH0/haproxytech-dataplaneapi-v3.3.5_GH0.tar.gz) = 1123390 +TIMESTAMP = 1783109424 +SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.4.0_GH0/go.mod) = de448e61f9ce83e40db237ee524f6811a954f09792998b0c9ac8f57ee3c84b4b +SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.4.0_GH0/go.mod) = 8610 +SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.4.0_GH0/haproxytech-dataplaneapi-v3.4.0_GH0.tar.gz) = 60ba97951c87a3da62f3e97bf681b1b1b440f30f5de2cb74d6e637200002adab +SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.4.0_GH0/haproxytech-dataplaneapi-v3.4.0_GH0.tar.gz) = 1020345 diff --git a/net/dataplaneapi/files/patch-configuration_configuration.go b/net/dataplaneapi/files/patch-configuration_configuration.go index ed3337fb83d8..bf92dbfaf960 100644 --- a/net/dataplaneapi/files/patch-configuration_configuration.go +++ b/net/dataplaneapi/files/patch-configuration_configuration.go @@ -1,34 +1,33 @@ ---- configuration/configuration.go.orig 2025-05-26 14:19:12 UTC +--- configuration/configuration.go.orig 2026-07-03 20:15:15 UTC +++ configuration/configuration.go -@@ -37,7 +37,7 @@ type HAProxyConfiguration struct { +@@ -36,7 +36,7 @@ type HAProxyConfiguration struct { var cfg *Configuration type HAProxyConfiguration struct { - SpoeDir string `long:"spoe-dir" description:"Path to SPOE directory." default:"/etc/haproxy/spoe" group:"resources"` + SpoeDir string `long:"spoe-dir" description:"Path to SPOE directory." default:"%%PREFIX%%/etc/haproxy/spoe" group:"resources"` ServiceName string `long:"service" description:"Name of the HAProxy service" group:"reload"` HAProxy string `short:"b" long:"haproxy-bin" description:"Path to the haproxy binary file" default:"haproxy" group:"haproxy"` UserListFile string `long:"userlist-file" description:"Path to the dataplaneapi userlist file. By default userlist is read from HAProxy conf. When specified userlist would be read from this file" group:"userlist"` -@@ -50,16 +50,16 @@ type HAProxyConfiguration struct { - TransactionDir string `short:"t" long:"transaction-dir" description:"Path to the transaction directory" default:"/tmp/haproxy" group:"transaction"` - ValidateCmd string `long:"validate-cmd" description:"Executes a custom command to perform the HAProxy configuration check" group:"reload"` +@@ -50,15 +50,15 @@ type HAProxyConfiguration struct { + ValidateFilesBefore []string `long:"validate-files-before" description:"A list of configuration files to be loaded before the main file for validation" group:"reload"` + ValidateFilesAfter []string `long:"validate-files-after" description:"A list of configuration files to be loaded after the main file for validation" group:"reload"` BackupsDir string `long:"backups-dir" description:"Path to directory in which to place backup files" group:"transaction"` - MapsDir string `short:"p" long:"maps-dir" description:"Path to directory of map files managed by dataplane" default:"/etc/haproxy/maps" group:"resources"` + MapsDir string `short:"p" long:"maps-dir" description:"Path to directory of map files managed by dataplane" default:"%%PREFIX%%/etc/haproxy/maps" group:"resources"` SpoeTransactionDir string `long:"spoe-transaction-dir" description:"Path to the SPOE transaction directory" default:"/tmp/spoe-haproxy" group:"resources"` - DataplaneConfig string `short:"f" description:"Path to the dataplane configuration file" default:"/etc/haproxy/dataplaneapi.yaml" yaml:"-"` - ConfigFile string `short:"c" long:"config-file" description:"Path to the haproxy configuration file" default:"/etc/haproxy/haproxy.cfg" group:"haproxy"` -+ DataplaneConfig string `short:"f" description:"Path to the dataplane configuration file" default:"%%PREFIX%%/etc/dataplaneapi.yaml" yaml:"-"` ++ DataplaneConfig string `short:"f" description:"Path to the dataplane configuration file" default:"%%PREFIX%%/etc/haproxy/dataplaneapi.yaml" yaml:"-"` + ConfigFile string `short:"c" long:"config-file" description:"Path to the haproxy configuration file" default:"%%PREFIX%%/etc/haproxy/haproxy.cfg" group:"haproxy"` Userlist string `short:"u" long:"userlist" description:"Userlist in HAProxy configuration to use for API Basic Authentication" default:"controller" group:"userlist"` MasterRuntime string `short:"m" long:"master-runtime" description:"Path to the master Runtime API socket" group:"haproxy"` - SSLCertsDir string `long:"ssl-certs-dir" description:"Path to SSL certificates directory" default:"/etc/haproxy/ssl" group:"resources"` - GeneralStorageDir string `long:"general-storage-dir" description:"Path to general storage directory" default:"/etc/haproxy/general" group:"resources"` +- DataplaneStorageDir string `long:"dataplane-storage-dir" description:"Path to dataplane internal storage directory" default:"/etc/haproxy/dataplane" group:"resources"` + SSLCertsDir string `long:"ssl-certs-dir" description:"Path to SSL certificates directory" default:"%%PREFIX%%/etc/haproxy/ssl" group:"resources"` + GeneralStorageDir string `long:"general-storage-dir" description:"Path to general storage directory" default:"%%PREFIX%%/etc/haproxy/general" group:"resources"` - ClusterTLSCertDir string `long:"cluster-tls-dir" description:"Path where cluster tls certificates will be stored. Defaults to same directory as dataplane configuration file" group:"cluster"` -- DataplaneStorageDir string `long:"dataplane-storage-dir" description:"Path to dataplane internal storage directory" default:"/etc/haproxy/dataplane" group:"resources"` + DataplaneStorageDir string `long:"dataplane-storage-dir" description:"Path to dataplane internal storage directory" default:"%%PREFIX%%/etc/haproxy/dataplane" group:"resources"` PreferredTimeSuffix string `long:"time-suffix" description:"Preferred time unit to use when writing time values in configuration (nearest, none, ms, s, m, h, d)" default:"nearest" group:"haproxy"` UpdateMapFilesPeriod int64 `long:"update-map-files-period" description:"Elapsed time in seconds between two maps syncing operations" default:"10" group:"resources"` ReloadDelay int `short:"d" long:"reload-delay" description:"Minimum delay between two reloads (in s)" default:"5" group:"reload"`