up

plugins/php-yum/index.html

@@ -9,7 +9,7 @@
 			<p onclick="phpUploadLimitReq($('.plugin_version').attr('version'));">上传限制</p>
 			<p onclick="phpTimeLimitReq($('.plugin_version').attr('version'));">超时限制</p>
 			<p onclick="pluginConfig('php-yum', $('.plugin_version').attr('version'));">配置文件</p>
-			<p onclick="pluginConfig('php-yum', $('.plugin_version').attr('version'),'get_fpm_conf');">FPM配置</p>
+			<p onclick="pluginConfig('php-yum', $('.plugin_version').attr('version'),'get_fpm_conf_file');">FPM配置</p>
 			<p onclick="disableFunc($('.plugin_version').attr('version'));">禁用函数</p>
 			<p onclick="getFpmConfig($('.plugin_version').attr('version'));">性能调整</p>
 			<p onclick="getFpmStatus($('.plugin_version').attr('version'));">负载状况</p>

plugins/php-yum/index.py

@@ -201,8 +201,8 @@ def phpFpmWwwReplace(version):
         mw.writeFile(service_php_fpmwww, content)
 
 
-def getFpmConf(version):
-    return getServerDir() + '/' + version + '/php-fpm.d/www.conf'
+def getFpmConfFile(version):
+    return getServerDir() + '/php' + version + '/php-fpm.d/www.conf'
 
 
 def makePhpIni(version):
@@ -211,9 +211,6 @@ def makePhpIni(version):
         src_ini = getPluginDir() + '/conf/php' + version[0:1] + '.ini'
         # shutil.copyfile(s_ini, d_ini)
         content = mw.readFile(src_ini)
-        if version == '52':
-            content = content + "auto_prepend_file=/www/server/php/app_start.php"
-
         content = contentReplace(content, version)
         mw.writeFile(dst_ini, content)
 
@@ -230,16 +227,6 @@ def initReplace(version):
     phpFpmWwwReplace(version)
     phpFpmReplace(version)
 
-    session_path = getServerDir() + '/tmp/session'
-    if not os.path.exists(session_path):
-        mw.execShell('mkdir -p ' + session_path)
-        mw.execShell('chown -R www:www ' + session_path)
-
-    upload_path = getServerDir() + '/tmp/upload'
-    if not os.path.exists(upload_path):
-        mw.execShell('mkdir -p ' + upload_path)
-        mw.execShell('chown -R www:www ' + upload_path)
-
     # systemd
     # mw.execShell('systemctl daemon-reload')
 
@@ -742,8 +729,8 @@ if __name__ == "__main__":
         print(getConfAppStart())
     elif func == 'get_php_conf':
         print(getPhpConf(version))
-    elif func == 'get_fpm_conf':
-        print(getFpmConf(version))
+    elif func == 'get_fpm_conf_file':
+        print(getFpmConfFile(version))
     elif func == 'submit_php_conf':
         print(submitPhpConf(version))
     elif func == 'get_limit_conf':