summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2012-10-12 14:01:04 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2012-10-12 14:01:04 +0000
commitab84524d86c1fabefe7f36d2ad02f5c5749926f0 (patch)
tree81baebcc11c96a9639cf70011545a55687e64aa1
parentUpdate to 0.8.2 release. (diff)
Use 'configtest' command to test config file to be consistent with apache,
nagios and others. Do not invent yet another wheel. Feature safe: yes
-rw-r--r--net/haproxy-devel/files/haproxy.in8
-rw-r--r--net/haproxy/files/haproxy.in8
2 files changed, 8 insertions, 8 deletions
diff --git a/net/haproxy-devel/files/haproxy.in b/net/haproxy-devel/files/haproxy.in
index 2076db94911e..823eb10109e5 100644
--- a/net/haproxy-devel/files/haproxy.in
+++ b/net/haproxy-devel/files/haproxy.in
@@ -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()
diff --git a/net/haproxy/files/haproxy.in b/net/haproxy/files/haproxy.in
index 2076db94911e..823eb10109e5 100644
--- a/net/haproxy/files/haproxy.in
+++ b/net/haproxy/files/haproxy.in
@@ -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()