diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py index 2d2fe9306..b3906c33d 100755 --- a/plugins/php-apt/index.py +++ b/plugins/php-apt/index.py @@ -98,15 +98,15 @@ def contentReplace(content, version): content = content.replace('{$PHP_USER}', 'nobody') content = content.replace('{$PHP_GROUP}', 'nobody') - rep = 'listen.owner\s*=\s*(.+)\r?\n' + rep = r'listen.owner\s*=\s*(.+)\r?\n' val = ';listen.owner = nobody\n' content = re.sub(rep, val, content) - rep = 'listen.group\s*=\s*(.+)\r?\n' + rep = r'listen.group\s*=\s*(.+)\r?\n' val = ';listen.group = nobody\n' content = re.sub(rep, val, content) - rep = 'user\s*=\s*(.+)\r?\n' + rep = r'user\s*=\s*(.+)\r?\n' val = ';user = nobody\n' content = re.sub(rep, val, content) @@ -305,7 +305,7 @@ def getPhpConf(version): phpini = mw.readFile(getConf(version)) result = [] for g in gets: - rep = g['name'] + '\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)' + rep = g['name'] + r'\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)' tmp = re.search(rep, phpini) if not tmp: continue @@ -324,7 +324,7 @@ def submitPhpConf(version): phpini = mw.readFile(filename) for g in gets: if g in args: - rep = g + '\s*=\s*(.+)\r?\n' + rep = g + r'\s*=\s*(.+)\r?\n' val = g + ' = ' + args[g] + '\n' phpini = re.sub(rep, val, phpini) mw.writeFile(filename, phpini) @@ -341,14 +341,14 @@ def getLimitConf(version): # print fileini, filefpm data = {} try: - rep = "upload_max_filesize\s*=\s*([0-9]+)M" + rep = r"upload_max_filesize\s*=\s*([0-9]+)M" tmp = re.search(rep, phpini).groups() data['max'] = tmp[0] except: data['max'] = '50' try: - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" tmp = re.search(rep, phpfpm).groups() data['maxTime'] = tmp[0] except: @@ -380,15 +380,15 @@ def setMaxTime(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" conf = re.sub(rep, "request_terminate_timeout = " + time + "\n", conf) mw.writeFile(filefpm, conf) fileini = getConf(version) phpini = mw.readFile(fileini) - rep = "max_execution_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_execution_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_execution_time = " + time + "\n", phpini) - rep = "max_input_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_input_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_input_time = " + time + "\n", phpini) mw.writeFile(fileini, phpini) return mw.returnJson(True, '设置成功!') @@ -406,9 +406,9 @@ def setMaxSize(version): path = getConf(version) conf = mw.readFile(path) - rep = u"\nupload_max_filesize\s*=\s*[0-9]+M" + rep = r"\nupload_max_filesize\s*=\s*[0-9]+M" conf = re.sub(rep, u'\nupload_max_filesize = ' + maxVal + 'M', conf) - rep = u"\npost_max_size\s*=\s*[0-9]+M" + rep = r"\npost_max_size\s*=\s*[0-9]+M" conf = re.sub(rep, u'\npost_max_size = ' + maxVal + 'M', conf) mw.writeFile(path, conf) @@ -422,23 +422,23 @@ def getFpmConfig(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) data = {} - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_children'] = tmp[0] - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['start_servers'] = tmp[0] - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['min_spare_servers'] = tmp[0] - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_spare_servers'] = tmp[0] - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" tmp = re.search(rep, conf).groups() data['pm'] = tmp[0] return mw.getJson(data) @@ -459,21 +459,21 @@ def setFpmConfig(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_children = " + max_children, conf) - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.start_servers = " + start_servers, conf) - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.min_spare_servers = " + min_spare_servers, conf) - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_spare_servers = " + max_spare_servers + "\n", conf) - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" conf = re.sub(rep, "\npm = " + pm + "\n", conf) mw.writeFile(filefpm, conf) @@ -709,7 +709,7 @@ def getDisableFunc(version): phpini = mw.readFile(filename) data = {} - rep = "disable_functions\s*=\s{0,1}(.*)\n" + rep = r"disable_functions\s*=\s{0,1}(.*)\n" tmp = re.search(rep, phpini).groups() data['disable_functions'] = tmp[0] return mw.getJson(data) @@ -724,7 +724,7 @@ def setDisableFunc(version): disable_functions = args['disable_functions'] phpini = mw.readFile(filename) - rep = "disable_functions\s*=\s*.*\n" + rep = r"disable_functions\s*=\s*.*\n" phpini = re.sub(rep, 'disable_functions = ' + disable_functions + "\n", phpini) diff --git a/plugins/php-apt/index_php_apt.py b/plugins/php-apt/index_php_apt.py index 37a68a0ce..97ade4c7d 100755 --- a/plugins/php-apt/index_php_apt.py +++ b/plugins/php-apt/index_php_apt.py @@ -69,7 +69,7 @@ def status_progress(version): def getPhpSocket(version): path = getFpmConfFile(version) content = mw.readFile(path) - rep = 'listen\s*=\s*(.*)' + rep = r'listen\s*=\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -116,7 +116,7 @@ def getPhpinfo(version): return 'PHP[' + version + ']未启动,不可访问!!!' sock_file = getFpmAddress(version) - print(sock_file) + # print(sock_file) root_dir = mw.getRootDir() + '/phpinfo' mw.execShell("rm -rf " + root_dir) diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py index 93c8f674f..2d0c87ad3 100755 --- a/plugins/php-yum/index.py +++ b/plugins/php-yum/index.py @@ -345,14 +345,14 @@ def getLimitConf(version): # print fileini, filefpm data = {} try: - rep = "upload_max_filesize\s*=\s*([0-9]+)M" + rep = r"upload_max_filesize\s*=\s*([0-9]+)M" tmp = re.search(rep, phpini).groups() data['max'] = tmp[0] except: data['max'] = '50' try: - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" tmp = re.search(rep, phpfpm).groups() data['maxTime'] = tmp[0] except: @@ -384,15 +384,15 @@ def setMaxTime(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" conf = re.sub(rep, "request_terminate_timeout = " + time + "\n", conf) mw.writeFile(filefpm, conf) fileini = getConf(version) phpini = mw.readFile(fileini) - rep = "max_execution_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_execution_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_execution_time = " + time + "\n", phpini) - rep = "max_input_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_input_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_input_time = " + time + "\n", phpini) mw.writeFile(fileini, phpini) return mw.returnJson(True, '设置成功!') @@ -410,9 +410,9 @@ def setMaxSize(version): path = getConf(version) conf = mw.readFile(path) - rep = u"\nupload_max_filesize\s*=\s*[0-9]+M" + rep = r"\nupload_max_filesize\s*=\s*[0-9]+M" conf = re.sub(rep, u'\nupload_max_filesize = ' + maxVal + 'M', conf) - rep = u"\npost_max_size\s*=\s*[0-9]+M" + rep = r"\npost_max_size\s*=\s*[0-9]+M" conf = re.sub(rep, u'\npost_max_size = ' + maxVal + 'M', conf) mw.writeFile(path, conf) @@ -426,23 +426,23 @@ def getFpmConfig(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) data = {} - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_children'] = tmp[0] - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['start_servers'] = tmp[0] - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['min_spare_servers'] = tmp[0] - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_spare_servers'] = tmp[0] - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" tmp = re.search(rep, conf).groups() data['pm'] = tmp[0] return mw.getJson(data) @@ -463,21 +463,21 @@ def setFpmConfig(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_children = " + max_children, conf) - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.start_servers = " + start_servers, conf) - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.min_spare_servers = " + min_spare_servers, conf) - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_spare_servers = " + max_spare_servers + "\n", conf) - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" conf = re.sub(rep, "\npm = " + pm + "\n", conf) mw.writeFile(filefpm, conf) @@ -713,7 +713,7 @@ def getDisableFunc(version): phpini = mw.readFile(filename) data = {} - rep = "disable_functions\s*=\s{0,1}(.*)\n" + rep = r"disable_functions\s*=\s{0,1}(.*)\n" tmp = re.search(rep, phpini).groups() data['disable_functions'] = tmp[0] return mw.getJson(data) @@ -728,7 +728,7 @@ def setDisableFunc(version): disable_functions = args['disable_functions'] phpini = mw.readFile(filename) - rep = "disable_functions\s*=\s*.*\n" + rep = r"disable_functions\s*=\s*.*\n" phpini = re.sub(rep, 'disable_functions = ' + disable_functions + "\n", phpini) msg = mw.getInfo('修改PHP-{1}的禁用函数为[{2}]', (version, disable_functions,)) diff --git a/plugins/php/index.py b/plugins/php/index.py index e18ee7292..ac905c358 100755 --- a/plugins/php/index.py +++ b/plugins/php/index.py @@ -101,7 +101,7 @@ def status_progress(version): def getPhpSocket(version): path = getFpmConfFile(version) content = mw.readFile(path) - rep = 'listen\s*=\s*(.*)' + rep = r'listen\s*=\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -133,15 +133,15 @@ def contentReplace(content, version): content = content.replace('{$PHP_USER}', 'nobody') content = content.replace('{$PHP_GROUP}', 'nobody') - rep = 'listen.owner\s*=\s*(.+)\r?\n' + rep = r'listen.owner\s*=\s*(.+)\r?\n' val = ';listen.owner = nobody\n' content = re.sub(rep, val, content) - rep = 'listen.group\s*=\s*(.+)\r?\n' + rep = r'listen.group\s*=\s*(.+)\r?\n' val = ';listen.group = nobody\n' content = re.sub(rep, val, content) - rep = 'user\s*=\s*(.+)\r?\n' + rep = r'user\s*=\s*(.+)\r?\n' val = ';user = nobody\n' content = re.sub(rep, val, content) @@ -449,7 +449,7 @@ def getPhpConf(version): phpini = mw.readFile(getConf(version)) result = [] for g in gets: - rep = g['name'] + '\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)' + rep = g['name'] + r'\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)' tmp = re.search(rep, phpini) if not tmp: continue @@ -468,7 +468,7 @@ def submitPhpConf(version): phpini = mw.readFile(filename) for g in gets: if g in args: - rep = g + '\s*=\s*(.+)\r?\n' + rep = g + r'\s*=\s*(.+)\r?\n' val = g + ' = ' + args[g] + '\n' phpini = re.sub(rep, val, phpini) mw.writeFile(filename, phpini) @@ -486,14 +486,14 @@ def getLimitConf(version): # print fileini, filefpm data = {} try: - rep = "upload_max_filesize\s*=\s*([0-9]+)M" + rep = r"upload_max_filesize\s*=\s*([0-9]+)M" tmp = re.search(rep, phpini).groups() data['max'] = tmp[0] except: data['max'] = '50' try: - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" tmp = re.search(rep, phpfpm).groups() data['maxTime'] = tmp[0] except: @@ -525,15 +525,15 @@ def setMaxTime(version): filefpm = getFpmConfFile(version) conf = mw.readFile(filefpm) - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" conf = re.sub(rep, "request_terminate_timeout = " + time + "\n", conf) mw.writeFile(filefpm, conf) fileini = getServerDir() + "/" + version + "/etc/php.ini" phpini = mw.readFile(fileini) - rep = "max_execution_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_execution_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_execution_time = " + time + "\n", phpini) - rep = "max_input_time\s*=\s*([0-9]+)\r?\n" + rep = r"max_input_time\s*=\s*([0-9]+)\r?\n" phpini = re.sub(rep, "max_input_time = " + time + "\n", phpini) mw.writeFile(fileini, phpini) return mw.returnJson(True, '设置成功!') @@ -551,9 +551,9 @@ def setMaxSize(version): path = getConf(version) conf = mw.readFile(path) - rep = u"\nupload_max_filesize\s*=\s*[0-9]+M" + rep = r"\nupload_max_filesize\s*=\s*[0-9]+M" conf = re.sub(rep, u'\nupload_max_filesize = ' + maxVal + 'M', conf) - rep = u"\npost_max_size\s*=\s*[0-9]+M" + rep = r"\npost_max_size\s*=\s*[0-9]+M" conf = re.sub(rep, u'\npost_max_size = ' + maxVal + 'M', conf) mw.writeFile(path, conf) @@ -571,23 +571,23 @@ def getFpmConfig(version, pool = 'www'): filefpm = getServerDir() + '/' + version + '/etc/php-fpm.d/'+pool+'.conf' conf = mw.readFile(filefpm) data = {} - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_children'] = tmp[0] - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['start_servers'] = tmp[0] - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['min_spare_servers'] = tmp[0] - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" tmp = re.search(rep, conf).groups() data['max_spare_servers'] = tmp[0] - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" tmp = re.search(rep, conf).groups() data['pm'] = tmp[0] return mw.getJson(data) @@ -610,21 +610,21 @@ def setFpmConfig(version): file = getServerDir() + '/' + version + '/etc/php-fpm.d/'+pool+'.conf' conf = mw.readFile(file) - rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_children\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_children = " + max_children, conf) - rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.start_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.start_servers = " + start_servers, conf) - rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" + rep = r"\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.min_spare_servers = " + min_spare_servers, conf) - rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" + rep = r"\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*" conf = re.sub(rep, "\npm.max_spare_servers = " + max_spare_servers + "\n", conf) - rep = "\s*pm\s*=\s*(\w+)\s*" + rep = r"\s*pm\s*=\s*(\w+)\s*" conf = re.sub(rep, "\npm = " + pm + "\n", conf) mw.writeFile(file, conf) @@ -883,7 +883,7 @@ def getDisableFunc(version): phpini = mw.readFile(filename) data = {} - rep = "disable_functions\s*=\s{0,1}(.*)\n" + rep = r"disable_functions\s*=\s{0,1}(.*)\n" tmp = re.search(rep, phpini).groups() data['disable_functions'] = tmp[0] return mw.getJson(data) @@ -898,7 +898,7 @@ def setDisableFunc(version): disable_functions = args['disable_functions'] phpini = mw.readFile(filename) - rep = "disable_functions\s*=\s*.*\n" + rep = r"disable_functions\s*=\s*.*\n" phpini = re.sub(rep, 'disable_functions = ' + disable_functions + "\n", phpini) diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py index 659292191..eac12be55 100755 --- a/plugins/phpmyadmin/index.py +++ b/plugins/phpmyadmin/index.py @@ -355,7 +355,7 @@ def setPmaPort(): if not os.path.exists(file): return mw.returnJson(False, '插件未启动!') content = mw.readFile(file) - rep = 'listen\s*(.*);' + rep = r'listen\s*(.*);' content = re.sub(rep, "listen " + port + ';', content) mw.writeFile(file, content) diff --git a/plugins/postgresql/index.py b/plugins/postgresql/index.py index 307a2447a..5ac2bab9f 100755 --- a/plugins/postgresql/index.py +++ b/plugins/postgresql/index.py @@ -116,7 +116,7 @@ def readConfigTpl(): def getDbPort(): file = getConf() content = mw.readFile(file) - rep = 'port\s*=\s*(\d*)?' + rep = r'port\s*=\s*(\d*)?' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -400,7 +400,7 @@ def initdUinstall(): def getMyDbPos(): file = getConf() content = mw.readFile(file) - rep = 'datadir\s*=\s*(.*)' + rep = r'datadir\s*=\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -408,7 +408,7 @@ def getMyDbPos(): def getPgPort(): file = getConf() content = mw.readFile(file) - rep = 'port\s*=\s*(.*)' + rep = r'port\s*=\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -422,7 +422,7 @@ def setPgPort(): port = args['port'] file = getConf() content = mw.readFile(file) - rep = "port\s*=\s*([0-9]+)\s*\n" + rep = r"port\s*=\s*([0-9]+)\s*\n" content = re.sub(rep, 'port = ' + port + '\n', content) mw.writeFile(file, content) restart() diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py index e5da432fc..6bb40ff74 100755 --- a/plugins/pureftp/index.py +++ b/plugins/pureftp/index.py @@ -277,7 +277,7 @@ def getFtpPort(): try: file = getServerDir() + '/etc/pure-ftpd.conf' conf = mw.readFile(file) - rep = "\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)" + rep = r"\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)" port = re.search(rep, conf).groups()[0] except: port = '21' diff --git a/plugins/redis/index.py b/plugins/redis/index.py index d5113e824..9224ae8f9 100755 --- a/plugins/redis/index.py +++ b/plugins/redis/index.py @@ -100,7 +100,7 @@ def readConfigTpl(): def getPidFile(): file = getConf() content = mw.readFile(file) - rep = 'pidfile\s*(.*)' + rep = r'pidfile\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() @@ -220,7 +220,7 @@ def getPort(): conf = getServerDir() + '/redis.conf' content = mw.readFile(conf) - rep = "^(" + 'port' + ')\s*([.0-9A-Za-z_& ~]+)' + rep = r"^(" + 'port' + ')\s*([.0-9A-Za-z_& ~]+)' tmp = re.search(rep, content, re.M) if tmp: return tmp.groups()[1] @@ -232,7 +232,7 @@ def getRedisCmd(): requirepass = "" conf = getServerDir() + '/redis.conf' content = mw.readFile(conf) - rep = "^(requirepass" + ')\s*([.0-9A-Za-z_& ~]+)' + rep = r"^(requirepass" + ')\s*([.0-9A-Za-z_& ~]+)' tmp = re.search(rep, content, re.M) if tmp: requirepass = tmp.groups()[1] diff --git a/plugins/rsyncd/index.py b/plugins/rsyncd/index.py index 6018d984a..9423ab738 100755 --- a/plugins/rsyncd/index.py +++ b/plugins/rsyncd/index.py @@ -96,7 +96,7 @@ def appAuthPwd(name): def getLog(): conf_path = appConf() conf = mw.readFile(conf_path) - rep = 'log file\s*=\s*(.*)' + rep = r'log file\s*=\s*(.*)' tmp = re.search(rep, conf) if not tmp: return '' @@ -106,7 +106,7 @@ def getLog(): def getLsyncdLog(): path = getServerDir() + "/lsyncd.conf" conf = mw.readFile(path) - rep = 'logfile\s*=\s*\"(.*)\"' + rep = r'logfile\s*=\s*\"(.*)\"' tmp = re.search(rep, conf) if not tmp: return '' diff --git a/plugins/simpleping/index.py b/plugins/simpleping/index.py index 89a8b16fb..f27b2b3c2 100755 --- a/plugins/simpleping/index.py +++ b/plugins/simpleping/index.py @@ -117,7 +117,7 @@ def readConfigTpl(): def getPidFile(): file = getConf() content = mw.readFile(file) - rep = 'pidfile\s*(.*)' + rep = r'pidfile\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip()