From 4191ff5a6f1eb993a861b7fa7b866d8b02ec4a50 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 30 Jul 2022 11:49:57 +0800
Subject: [PATCH] Update index.py

---
 plugins/rsyncd/index.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/rsyncd/index.py b/plugins/rsyncd/index.py
index 122dd6294..9ceba204a 100755
--- a/plugins/rsyncd/index.py
+++ b/plugins/rsyncd/index.py
@@ -73,6 +73,12 @@ def status():
         "ps -ef|grep rsync |grep -v grep | grep -v python | awk '{print $2}'")
     if data[0] == '':
         return 'stop'
+
+    data = mw.execShell(
+        "ps -ef|grep lsyncd |grep -v grep | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+
     return 'start'
 
 
@@ -522,6 +528,7 @@ def makeLsyncdConf(data):
             mw.writeFile(cmd_exclude, "")
             cmd_pass = name_dir + "/pass"
             mw.writeFile(cmd_pass, t['password'])
+            mw.execShell("chmod 600 " + cmd_pass)
 
             remote_addr = t['name'] + '@' + t['ip'] + "::" + t['name']
             cmd = rsync_bin + " -avzP " + "--port=" + str(t['rsync']['port']) + " --bwlimit=" + t['rsync'][
@@ -546,8 +553,7 @@ def makeLsyncdConf(data):
             content += "\t\tcompress = " + t['rsync']['compress'] + ",\n"
             content += "\t\t_extra = {\"--bwlimit=" + t['rsync'][
                 'bwlimit'] + "\", --port=\"" + str(t['rsync']['port']) + "\"}\n"
-            # password_file =
-            # "/www/server/panel/plugin/rsync/sclient/debug_pass",
+            content += "\t\tpassword-file=\"" + cmd_pass + "\",\n"
 
             content += "\t}\n"