From owner-svn-ports-all@FreeBSD.ORG Fri Oct 12 14:01:05 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 35D2857D; Fri, 12 Oct 2012 14:01:05 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 03FC48FC0C; Fri, 12 Oct 2012 14:01:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9CE14Dt015764; Fri, 12 Oct 2012 14:01:04 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9CE14XR015761; Fri, 12 Oct 2012 14:01:04 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201210121401.q9CE14XR015761@svn.freebsd.org> From: Dmitry Sivachenko Date: Fri, 12 Oct 2012 14:01:04 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2012 14:01:05 -0000 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()