Date: Fri, 12 Oct 2012 14:01:04 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305780 - in head/net: haproxy-devel/files haproxy/files Message-ID: <201210121401.q9CE14XR015761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Fri Oct 12 14:01:04 2012 New Revision: 305780 URL: http://svn.freebsd.org/changeset/ports/305780 Log: Use 'configtest' command to test config file to be consistent with apache, nagios and others. Do not invent yet another wheel. Feature safe: yes Modified: head/net/haproxy-devel/files/haproxy.in (contents, props changed) head/net/haproxy/files/haproxy.in (contents, props changed) Modified: head/net/haproxy-devel/files/haproxy.in ============================================================================== --- head/net/haproxy-devel/files/haproxy.in Fri Oct 12 13:57:26 2012 (r305779) +++ head/net/haproxy-devel/files/haproxy.in Fri Oct 12 14:01:04 2012 (r305780) @@ -30,7 +30,7 @@ # reload - hot-reconfig using "-sf" option (active sessions kept) # forcereload - hot-reconfig using "-st" option (active sessions killed) # restart - equiv to "stop" then "start" -# checkconfig - checks configuration file defined in haproxy_config +# configtest - checks configuration file defined in haproxy_config # ####### @@ -51,10 +51,10 @@ load_rc_config $name pidfile=${haproxy_pidfile} required_files=${haproxy_config} -# Commands: start, stop, restart, reload, checkconfig -extra_commands="reload checkconfig" +# Commands: start, stop, restart, reload, configtest +extra_commands="reload configtest" -checkconfig_cmd="haproxy_checkconfig" +configtest_cmd="haproxy_checkconfig" reload_cmd="haproxy_reload" haproxy_reload() Modified: head/net/haproxy/files/haproxy.in ============================================================================== --- head/net/haproxy/files/haproxy.in Fri Oct 12 13:57:26 2012 (r305779) +++ head/net/haproxy/files/haproxy.in Fri Oct 12 14:01:04 2012 (r305780) @@ -30,7 +30,7 @@ # reload - hot-reconfig using "-sf" option (active sessions kept) # forcereload - hot-reconfig using "-st" option (active sessions killed) # restart - equiv to "stop" then "start" -# checkconfig - checks configuration file defined in haproxy_config +# configtest - checks configuration file defined in haproxy_config # ####### @@ -51,10 +51,10 @@ load_rc_config $name pidfile=${haproxy_pidfile} required_files=${haproxy_config} -# Commands: start, stop, restart, reload, checkconfig -extra_commands="reload checkconfig" +# Commands: start, stop, restart, reload, configtest +extra_commands="reload configtest" -checkconfig_cmd="haproxy_checkconfig" +configtest_cmd="haproxy_checkconfig" reload_cmd="haproxy_reload" haproxy_reload()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210121401.q9CE14XR015761>