rsyncd tp systemd

plugins/rsyncd/index.py

@@ -126,8 +126,18 @@ def initDreplace():
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
 
-    # if os.path.exists('/usr/lib/systemd/system/rsyncd.service'):
+    # systemd
-    #     mw.execShell('rm -rf /usr/lib/systemd/system/rsyncd*')
+    systemDir = '/lib/systemd/system'
+    systemService = systemDir + '/rsyncd.service'
+    systemServiceTpl = getPluginDir() + '/init.d/rsyncd.service.tpl'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        rsync_bin = mw.execShell('which rsync')[0].strip()
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        se_content = se_content.replace('{$RSYNC_BIN}', rsync_bin)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
 
     rlog = getLog()
     if os.path.exists(rlog):
@@ -135,65 +145,53 @@ def initDreplace():
     return file_bin
 
 
-def start():
+def rsyncOp(method)
+
     file = initDreplace()
-    data = mw.execShell(file + ' start')
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' rsyncd')
         if data[1] == '':
             return 'ok'
         return 'fail'
 
-
+    data = mw.execShell(file + ' ' + method)
-def stop():
-    file = initDreplace()
-    data = mw.execShell(file + ' stop')
     if data[1] == '':
         return 'ok'
     return 'fail'
 
 
+def start():
+    return rsyncOp('start')
+
+
+def stop():
+    return rsyncOp('stop')
+
+
 def restart():
-    if mw.isAppleSystem():
+    return rsyncOp('restart')
-        return "Apple Computer does not support"
-    stop()
-    start()
-    return 'ok'
 
 
 def reload():
-    if mw.isAppleSystem():
+    return rsyncOp('reload')
-        return "Apple Computer does not support"
-
-    # data = mw.execShell('systemctl reload rsyncd.service')
-    # if data[1] == '':
-    #     return 'ok'
-    # return 'fail'
-    stop()
-    start()
-    return 'ok'
 
 
 def initdStatus():
-    if not app_debug:
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    initd_bin = getInitDFile()
+    shell_cmd = 'systemctl status rsyncd | grep loaded | grep "enabled;"'
-    if os.path.exists(initd_bin):
+    data = mw.execShell(shell_cmd)
-        return 'ok'
+    if data[0] == '':
         return 'fail'
+    return 'ok'
 
 
 def initdInstall():
-    import shutil
-    if not app_debug:
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    p_bin = initDreplace()
+    mw.execShell('systemctl enable rsyncd')
-    initd_bin = getInitDFile()
-    shutil.copyfile(p_bin, initd_bin)
-    mw.execShell('chmod +x ' + initd_bin)
-    mw.execShell('chkconfig --add ' + getPluginName())
     return 'ok'
 
 
@@ -201,9 +199,8 @@ def initdUinstall():
     if not app_debug:
         if mw.isAppleSystem():
             return "Apple Computer does not support"
-    initd_bin = getInitDFile()
+
-    os.remove(initd_bin)
+    mw.execShell('systemctl diable rsyncd')
-    mw.execShell('chkconfig --del ' + getPluginName())
     return 'ok'
 
 

plugins/rsyncd/init.d/rsyncd.service.tpl

@@ -0,0 +1,9 @@
+[Unit]
+Description=fast remote file copy program daemon
+ConditionPathExists={$SERVER_PATH}/rsyncd/rsyncd.conf
+
+[Service]
+ExecStart={$RSYNC_BIN} --daemon --no-detach
+
+[Install]
+WantedBy=multi-user.target

plugins/supervisor/index.py

@@ -113,6 +113,10 @@ def initDreplace():
     return True
 
 
+def supOp(method):
+    pass
+
+
 def start():
     initDreplace()
 
@@ -181,7 +185,6 @@ def reload():
 
 
 def initdStatus():
-    if not app_debug:
     if mw.isAppleSystem():
         return "Apple Computer does not support"