Re: haproxy: add configtest

01.11.2026 14:43, Klemens Nanni пишет: > 01.11.2026 14:37, Rafael Sadowski пишет: >> On Sun Nov 01, 2026 at 09:46:27AM +0000, Klemens Nanni wrote: >>> 'rcctl [-d] configtest haproxy' works for me. >>> >>> -c Only checks config file and exits with code 0 if no error was >>> found, or exits with code 1 if a syntax error was found. >>> >>> OK? >>> >>> Index: Makefile >>> =================================================================== >>> RCS file: /cvs/ports/net/haproxy/Makefile,v >>> diff -u -p -r1.143 Makefile >>> --- Makefile 15 Oct 2026 14:24:40 -0000 1.143 >>> +++ Makefile 1 Nov 2026 09:43:17 -0000 >>> @@ -4,6 +4,7 @@ DISTNAME = haproxy-3.4.7 >>> CATEGORIES = net www >>> HOMEPAGE = https://www.haproxy.org >>> MAINTAINER = Lucas Gabriel Vuotto <lucas@sexy.is> >>> +REVISION = 0 >>> >>> # GPLv2 >>> PERMIT_PACKAGE = Yes >>> Index: pkg/haproxy.rc >>> =================================================================== >>> RCS file: /cvs/ports/net/haproxy/pkg/haproxy.rc,v >>> diff -u -p -r1.6 haproxy.rc >>> --- pkg/haproxy.rc 3 Jun 2024 21:36:14 -0000 1.6 >>> +++ pkg/haproxy.rc 1 Nov 2026 09:43:57 -0000 >>> @@ -8,6 +8,10 @@ daemon_flags="-f ${SYSCONFDIR}/haproxy/h >>> # rc_reload() appends '-sf ...' >>> pexp="${daemon}${daemon_flags:+ ${daemon_flags}}.*" >>> >>> +rc_configtest() { >>> + ${daemon} ${daemon_flags} -c >> >> in base daemons we use: >> >> # use rc_exec here since daemon_flags may contain arguments with spaces >> $rc_exec {daemon} ${daemon_flags} -c > > The majority does, bu not all; nsd uses both ways. > > I never looked into this and a bunch of base/ports services are fine > without the special treatment, so personally I'm inclined to do without > rc_exec until someone points out a specific example that breaks. > >> >>> +} >>> + >>> rc_reload() { >>> ${daemon} ${daemon_flags} -sf $(cat /var/run/haproxy.pid) >>> } >>> > Weekly ping. rc_reload() above also uses the plain construct and noone complained so far. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/net/haproxy/Makefile,v diff -u -p -r1.143 Makefile --- Makefile 15 Oct 2026 14:24:40 -0000 1.143 +++ Makefile 1 Nov 2026 09:50:03 -0000 @@ -4,6 +4,7 @@ DISTNAME = haproxy-3.4.7 CATEGORIES = net www HOMEPAGE = https://www.haproxy.org MAINTAINER = Lucas Gabriel Vuotto <lucas@sexy.is> +REVISION = 0 # GPLv2 PERMIT_PACKAGE = Yes Index: pkg/haproxy.rc =================================================================== RCS file: /cvs/ports/net/haproxy/pkg/haproxy.rc,v diff -u -p -r1.6 haproxy.rc --- pkg/haproxy.rc 3 Jun 2024 21:36:14 -0000 1.6 +++ pkg/haproxy.rc 1 Nov 2026 09:43:57 -0000 @@ -8,6 +8,10 @@ daemon_flags="-f ${SYSCONFDIR}/haproxy/h # rc_reload() appends '-sf ...' pexp="${daemon}${daemon_flags:+ ${daemon_flags}}.*" +rc_configtest() { + ${daemon} ${daemon_flags} -c +} + rc_reload() { ${daemon} ${daemon_flags} -sf $(cat /var/run/haproxy.pid) }