diff --git a/plugins/socket5/index.html b/plugins/socket5/index.html index 14faded78..9a82bc0fb 100755 --- a/plugins/socket5/index.html +++ b/plugins/socket5/index.html @@ -2,9 +2,8 @@

服务

-

用户配置

-

PSK配置

-

用户列表

+

配置

+

用户

说明

diff --git a/plugins/socket5/index.py b/plugins/socket5/index.py index e3e059789..3e896f45b 100755 --- a/plugins/socket5/index.py +++ b/plugins/socket5/index.py @@ -15,7 +15,7 @@ if mw.isAppleSystem(): def getPluginName(): - return 'l2tp' + return 'socket5' def getPluginDir(): @@ -111,14 +111,14 @@ def reload(): def getPathFile(): if mw.isAppleSystem(): - return getServerDir() + '/chap-secrets' - return '/etc/ppp/chap-secrets' + return getServerDir() + '/ss5.conf' + return '/etc/opt/ss5/ss5.conf' -def getPathFilePsk(): +def getPathFilePwd(): if mw.isAppleSystem(): - return getServerDir() + '/ipsec.secrets' - return '/etc/ipsec.secrets' + return getServerDir() + '/ss5.passwd' + return '/etc/opt/ss5/ss5.passwd' def getUserList(): @@ -220,7 +220,7 @@ if __name__ == "__main__": elif func == 'conf': print getPathFile() elif func == 'conf_psk': - print getPathFilePsk() + print getPathFilePwd() elif func == 'user_list': print getUserList() elif func == 'add_user': diff --git a/plugins/socket5/install.sh b/plugins/socket5/install.sh index 05be16b1c..2f2a97592 100755 --- a/plugins/socket5/install.sh +++ b/plugins/socket5/install.sh @@ -35,6 +35,7 @@ Install_socket5() Uninstall_socket5() { rm -rf $serverPath/socket5 + rm -rf /usr/sbin/ss5 echo "Uninstall completed" > $install_tmp } diff --git a/plugins/socket5/js/socket5.js b/plugins/socket5/js/socket5.js index df80baa57..3b5da6cda 100755 --- a/plugins/socket5/js/socket5.js +++ b/plugins/socket5/js/socket5.js @@ -151,8 +151,7 @@ function modUser(username){ function readme(){ var readme = ''; $('.soft-man-con').html(readme); }