Fix haproxy cron issue, use full path. Fixes #9922

(cherry picked from commit 47f4f91)
pfsense · Nov 25, 2019 · e8bec3b · e8bec3b
1 parent b47b916
commit e8bec3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/net/pfSense-pkg-haproxy-devel/Makefile b/net/pfSense-pkg-haproxy-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-haproxy-devel
 PORTVERSION=	0.59
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy.inc b/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy.inc
@@ -407,7 +407,7 @@ global $haproxy_version;
 function haproxy_version() {
 	global $haproxy_version;
 	if (empty($haproxy_version)) {
-		$haproxy_version = shell_exec("haproxy -v | head -n 1 | awk '{ print $3 }'");
+		$haproxy_version = shell_exec("/usr/local/sbin/haproxy -v | head -n 1 | awk '{ print $3 }'");
 	}
 	return $haproxy_version;
 }

diff --git a/net/pfSense-pkg-haproxy/Makefile b/net/pfSense-pkg-haproxy/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-haproxy
 PORTVERSION=	0.59
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-haproxy/files/usr/local/pkg/haproxy/haproxy.inc b/net/pfSense-pkg-haproxy/files/usr/local/pkg/haproxy/haproxy.inc
@@ -407,7 +407,7 @@ global $haproxy_version;
 function haproxy_version() {
 	global $haproxy_version;
 	if (empty($haproxy_version)) {
-		$haproxy_version = shell_exec("haproxy -v | head -n 1 | awk '{ print $3 }'");
+		$haproxy_version = shell_exec("/usr/local/sbin/haproxy -v | head -n 1 | awk '{ print $3 }'");
 	}
 	return $haproxy_version;
 }