From c97ec1cbba8f9ddeb533e9e26213890a1015ef0c Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 29 Aug 2022 12:08:02 +0800
Subject: [PATCH] up

---
 plugins/haproxy/init.d/haproxy.service.tpl |  2 +-
 plugins/haproxy/init.d/haproxy.tpl         | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/haproxy/init.d/haproxy.service.tpl b/plugins/haproxy/init.d/haproxy.service.tpl
index aa84b3e4b..d14a5530a 100644
--- a/plugins/haproxy/init.d/haproxy.service.tpl
+++ b/plugins/haproxy/init.d/haproxy.service.tpl
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStartPre={$SERVER_PATH}/haproxy/sbin/haproxy -c -f {$SERVER_PATH}/haproxy/haproxy.conf
-ExecStart={$SERVER_PATH}/haproxy/sbin/haproxy -Ws -f {$SERVER_PATH}/haproxy/haproxy.conf -p /run/haproxy.pid
+ExecStart={$SERVER_PATH}/haproxy/sbin/haproxy -D -f {$SERVER_PATH}/haproxy/haproxy.conf
 ExecReload={$SERVER_PATH}/haproxy/sbin/haproxy -f {$SERVER_PATH}/haproxy/haproxy.conf -c -q
 Restart=on-failure
 
diff --git a/plugins/haproxy/init.d/haproxy.tpl b/plugins/haproxy/init.d/haproxy.tpl
index f09c9fb1b..7309b1dbe 100644
--- a/plugins/haproxy/init.d/haproxy.tpl
+++ b/plugins/haproxy/init.d/haproxy.tpl
@@ -15,14 +15,16 @@ if [ -f /etc/init.d/functions ]; then
 elif [ -f /etc/rc.d/init.d/functions ] ; then
   . /etc/rc.d/init.d/functions
 else
-  exit 0
+  echo ".."
 fi
  
 # Source networking configuration.
- 
-. /etc/sysconfig/network
+if [ -f /etc/sysconfig/network ];then
+  . /etc/sysconfig/network
+fi
+
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+# [ ${NETWORKING} = "no" ] && exit 0
 
 HAPROXYDIR={$SERVER_PATH}/haproxy
 BASENAME=haproxy
@@ -42,16 +44,17 @@ RETVAL=0
 start() {
     $HAPROXYDIR/sbin/$BASENAME -c -q -f $HAPROXYDIR/etc/$BASENAME.conf
 
+
     if [ $? -ne 0 ]; then
     echo "Errors found in configuration file, check it with '$BASENAME check'."
     return 1
     fi
 
     echo -n "Starting $BASENAME: "
-    daemon $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/etc/$BASENAME.conf -p /var/run/$BASENAME.pid
+    daemon $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/etc/$BASENAME.conf
     RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
+    # echo
+    # [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
     return $RETVAL
 }
  
@@ -84,7 +87,7 @@ reload() {
     echo "Errors found in configuration file, check it with '$BASENAME check'."
     return 1
   fi
-  $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/etc/$BASENAME.conf -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid)
+  $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/$BASENAME.conf -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid)
 }
  
 check() {