diff --git a/plugins/csvn/install.sh b/plugins/csvn/install.sh index 25a64f6b8..fc4c786f5 100755 --- a/plugins/csvn/install.sh +++ b/plugins/csvn/install.sh @@ -36,9 +36,9 @@ Install_csvn() fi chown -R csvn:csvn $serverPath/csvn - - $serverPath/csvn/bin/csvn start - $serverPath/csvn/bin/csvn-httpd start + + $serverPath/csvn/bin/csvn install + $serverPath/csvn/bin/csvn-httpd install echo '安装完成' > $install_tmp } diff --git a/plugins/webssh/ico.png b/plugins/webssh/ico.png new file mode 100755 index 000000000..462b3206f Binary files /dev/null and b/plugins/webssh/ico.png differ diff --git a/plugins/webssh/index.html b/plugins/webssh/index.html new file mode 100755 index 000000000..e34eb9715 --- /dev/null +++ b/plugins/webssh/index.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/plugins/webssh/info.json b/plugins/webssh/info.json new file mode 100755 index 000000000..77434167d --- /dev/null +++ b/plugins/webssh/info.json @@ -0,0 +1,15 @@ +{ + "id":3, + "title":"宝塔SSH终端", + "tip":"lib", + "name":"webssh", + "type":"扩展", + "ps":"完整功能的SSH客户端,仅用于连接本服务器", + "versions":"1.0", + "shell":"webssh.sh", + "checks":"/www/server/panel/plugin/webssh", + "author":"宝塔", + "home":"http://www.bt.cn/bbs", + "date":"2018-10-20", + "pid":"4" +} \ No newline at end of file diff --git a/plugins/webssh/install.sh b/plugins/webssh/install.sh new file mode 100755 index 000000000..e88b3c5e7 --- /dev/null +++ b/plugins/webssh/install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +export PATH +install_tmp='/tmp/bt_install.pl' +public_file=/www/server/panel/install/public.sh +if [ ! -f $public_file ];then + wget -O $public_file http://download.bt.cn/install/public.sh -T 5; +fi +. $public_file + +download_Url=$NODE_URL + +Install_webssh() +{ + mkdir -p /www/server/panel/plugin/webssh + echo '正在安装脚本文件...' > $install_tmp + wget -O /www/server/panel/plugin/webssh/index.html $download_Url/install/plugin/webssh/index.html -T 5 + wget -O /www/server/panel/plugin/webssh/info.json $download_Url/install/plugin/webssh/info.json -T 5 + wget -O /www/server/panel/plugin/webssh/icon.png $download_Url/install/plugin/webssh/icon.png -T 5 + echo '安装完成' > $install_tmp +} + +Uninstall_webssh() +{ + rm -rf /www/server/panel/plugin/webssh +} + + +action=$1 +if [ "${1}" == 'install' ];then + Install_webssh +else + Uninstall_webssh +fi diff --git a/static/js/control.js b/static/app/control.js similarity index 100% rename from static/js/control.js rename to static/app/control.js diff --git a/static/js/crontab.js b/static/app/crontab.js similarity index 100% rename from static/js/crontab.js rename to static/app/crontab.js diff --git a/static/js/data.js b/static/app/data.js similarity index 100% rename from static/js/data.js rename to static/app/data.js diff --git a/static/js/files.js b/static/app/files.js similarity index 100% rename from static/js/files.js rename to static/app/files.js diff --git a/static/js/firewall.js b/static/app/firewall.js similarity index 100% rename from static/js/firewall.js rename to static/app/firewall.js diff --git a/static/js/ftp.js b/static/app/ftp.js similarity index 100% rename from static/js/ftp.js rename to static/app/ftp.js diff --git a/static/js/index.js b/static/app/index.js similarity index 100% rename from static/js/index.js rename to static/app/index.js diff --git a/static/js/public.js b/static/app/public.js similarity index 100% rename from static/js/public.js rename to static/app/public.js diff --git a/static/js/site.js b/static/app/site.js similarity index 100% rename from static/js/site.js rename to static/app/site.js diff --git a/static/js/soft.js b/static/app/soft.js similarity index 98% rename from static/js/soft.js rename to static/app/soft.js index bcd06ab90..18211b695 100755 --- a/static/js/soft.js +++ b/static/app/soft.js @@ -174,7 +174,6 @@ function getSList(isdisplay) { plugin_title = plugin.title + ' ' + plugin.setup_version; } - console.log(plugin_title); sBody += '