diff options
| author | demon <demon@FreeBSD.org> | 2012-06-06 01:45:41 +0800 |
|---|---|---|
| committer | demon <demon@FreeBSD.org> | 2012-06-06 01:45:41 +0800 |
| commit | 1938d1dbfca38df77bb771dd6dd26f790cfdc171 (patch) | |
| tree | a5ad53a4f800ea5cf433511f49e8b504a0566278 /net | |
| parent | bf20b34532389a5cf08534ad1caf49f579d24e9e (diff) | |
| download | freebsd-ports-gnome-1938d1dbfca38df77bb771dd6dd26f790cfdc171.tar.gz freebsd-ports-gnome-1938d1dbfca38df77bb771dd6dd26f790cfdc171.tar.zst freebsd-ports-gnome-1938d1dbfca38df77bb771dd6dd26f790cfdc171.zip | |
Add $FreeBSD$;
Add LOGIN to REQUIRE;
replace echo + return with err.
Suggested by: dougb
Diffstat (limited to 'net')
| -rw-r--r-- | net/haproxy-devel/files/haproxy.in | 11 | ||||
| -rw-r--r-- | net/haproxy/files/haproxy.in | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/net/haproxy-devel/files/haproxy.in b/net/haproxy-devel/files/haproxy.in index 2ee0406145cf..2076db94911e 100644 --- a/net/haproxy-devel/files/haproxy.in +++ b/net/haproxy-devel/files/haproxy.in @@ -1,7 +1,10 @@ #!/bin/sh +# +# $FreeBSD$ +# # PROVIDE: haproxy -# REQUIRE: DAEMON +# REQUIRE: DAEMON LOGIN # KEYWORD: shutdown ####### @@ -59,8 +62,7 @@ haproxy_reload() # Check configuration file quietly first ${command} -q -c -f ${haproxy_config} if [ $? -ne 0 ]; then - echo "Error found in ${haproxy_config} - not reloading current process!" - return 1 + err 1 "Error found in ${haproxy_config} - not reloading current process!" fi rc_pid=$(check_pidfile ${haproxy_pidfile} ${command}) if [ $rc_pid ]; then @@ -70,8 +72,7 @@ haproxy_reload() ${command} ${haproxy_flags} -sf ${rc_pid} fi else - echo "No process found. Maybe $command isn't running?" - return 1 + err 1 "No process found. Maybe $command isn't running?" fi } diff --git a/net/haproxy/files/haproxy.in b/net/haproxy/files/haproxy.in index 2ee0406145cf..2076db94911e 100644 --- a/net/haproxy/files/haproxy.in +++ b/net/haproxy/files/haproxy.in @@ -1,7 +1,10 @@ #!/bin/sh +# +# $FreeBSD$ +# # PROVIDE: haproxy -# REQUIRE: DAEMON +# REQUIRE: DAEMON LOGIN # KEYWORD: shutdown ####### @@ -59,8 +62,7 @@ haproxy_reload() # Check configuration file quietly first ${command} -q -c -f ${haproxy_config} if [ $? -ne 0 ]; then - echo "Error found in ${haproxy_config} - not reloading current process!" - return 1 + err 1 "Error found in ${haproxy_config} - not reloading current process!" fi rc_pid=$(check_pidfile ${haproxy_pidfile} ${command}) if [ $rc_pid ]; then @@ -70,8 +72,7 @@ haproxy_reload() ${command} ${haproxy_flags} -sf ${rc_pid} fi else - echo "No process found. Maybe $command isn't running?" - return 1 + err 1 "No process found. Maybe $command isn't running?" fi } |