diff --git a/plugins/phpldapadmin/conf/phpldapadmin.conf b/plugins/phpldapadmin/conf/phpldapadmin.conf index 01d734fae..046fb1967 100755 --- a/plugins/phpldapadmin/conf/phpldapadmin.conf +++ b/plugins/phpldapadmin/conf/phpldapadmin.conf @@ -3,14 +3,14 @@ server listen 888; server_name 127.0.0.1; index index.html index.htm index.php; - root {$SERVER_PATH}/phpmyadmin; + root {$SERVER_PATH}/phpldapadmin; #error_page 404 /404.html; include {$PHP_CONF_PATH}/enable-php-{$PHP_VER}.conf; #AUTH_START auth_basic "Authorization"; - auth_basic_user_file {$SERVER_PATH}/phpmyadmin/pma.pass; + auth_basic_user_file {$SERVER_PATH}/phpldapadmin/pma.pass; #AUTH_END location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$ @@ -33,6 +33,6 @@ server deny all; } - access_log {$SERVER_PATH}/phpmyadmin/access.log; - error_log {$SERVER_PATH}/phpmyadmin/error.log; + access_log {$SERVER_PATH}/phpldapadmin/access.log; + error_log {$SERVER_PATH}/phpldapadmin/error.log; } \ No newline at end of file diff --git a/plugins/phpldapadmin/index.py b/plugins/phpldapadmin/index.py index d22541686..db512eea8 100755 --- a/plugins/phpldapadmin/index.py +++ b/plugins/phpldapadmin/index.py @@ -119,8 +119,7 @@ def getCachePhpVer(): def contentReplace(content): service_path = mw.getServerDir() php_ver = getCachePhpVer() - tmp = mw.execShell( - 'cat /dev/urandom | head -n 32 | md5sum | head -c 16') + tmp = mw.execShell('cat /dev/urandom | head -n 32 | md5sum | head -c 16') blowfish_secret = tmp[0].strip() # print php_ver php_conf_dir = mw.getServerDir() + '/web_conf/php/conf' diff --git a/plugins/phpldapadmin/install.sh b/plugins/phpldapadmin/install.sh index 379ae2d44..40a2b0823 100755 --- a/plugins/phpldapadmin/install.sh +++ b/plugins/phpldapadmin/install.sh @@ -69,9 +69,8 @@ Install_App() cd $serverPath/phpldapadmin/ && mv $FDIR phpldapadmin # rm -rf $serverPath/source/phpldapadmin/$FDIR - echo '安装完成' - cd ${rootPath} && python3 ${rootPath}/plugins/phpldapadmin/index.py start + echo '安装完成' }