Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #103

Open
wants to merge 84 commits into
base: 7.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
48c2567
Create README.md
aaPanel Jun 17, 2019
998b67f
Update README.md
aaPanel Jun 17, 2019
4141941
Update README.md
aaPanel Jun 17, 2019
7b0effa
Update README.md
aaPanel Jun 17, 2019
f56d7f2
Update README.md
aaPanel Jun 17, 2019
5fef838
Create license.txt
aaPanel Jun 17, 2019
7f036c4
Update README.md
aaPanel Jun 17, 2019
6d2414b
Update README.md
aaPanel Jun 17, 2019
5c2e0d6
Update README.md
aaPanel Jun 17, 2019
8c5a814
6.9.5
showpy Jun 17, 2019
4beb227
修正文件搜索时的路径构造问题,增加启动面板时做面板关键目录的权限处理
showpy Jun 18, 2019
1409d08
修正文件搜索时没有过度提示的问题,优化文件列表路径构造
showpy Jun 18, 2019
f727c05
Update README.md
aaPanel Jun 18, 2019
f615130
SSH终端修复用户名密码带空格导致的登录失败
showpy Jun 18, 2019
dd46424
Merge branch 'master' of https://github.com/aaPanel/BaoTa
showpy Jun 18, 2019
675d0d4
更新节点配置
showpy Jun 18, 2019
acc53bd
修正Apache开启默认站点导致无法获取负载状态的问题
showpy Jun 18, 2019
5f506ff
增加phpMyadmin状态控制和修正其首页图标显示错误问题
showpy Jun 18, 2019
0a69822
优化官网连接机制
showpy Jun 19, 2019
d43d130
修复宝塔帐号绑定失效后,获取云端SSL列表时没有提示的问题
showpy Jun 19, 2019
192c88a
6.9.23
showpy Jun 19, 2019
9e087cb
增加BasicAuth认证功能,修正apache2.2下的一些显示问题,
showpy Jun 21, 2019
058e916
update .gitignore
showpy Jun 21, 2019
b9f97ab
增加面板运行日志查看按钮
showpy Jun 21, 2019
d451880
增加一键部署中导入的自定义项目的删除功能
showpy Jun 21, 2019
5ab65dc
修复在开启面板SSL后无法正确使用bt default获取面板协议的问题
showpy Jun 21, 2019
b64c7bd
修正非+8时区的时间同步问题
showpy Jun 22, 2019
048c97e
修正安装插件时没有自动选择节点的问题
showpy Jun 22, 2019
f4fb0da
提供bz2压缩格式的解压支持
showpy Jun 24, 2019
087ff05
计划任务备份网站和目录时提供文件目录的排除规则
showpy Jun 24, 2019
5b9f63c
一键部署自定义项目提供更新功能
showpy Jun 26, 2019
51816f3
优化批量文件上传时的权限设置效率
showpy Jun 28, 2019
10d7cbe
5.9.24
showpy Jul 2, 2019
300e5b9
Update public.py
safly Jul 2, 2019
3501d40
Update system.py
safly Jul 2, 2019
509927c
Merge pull request #11 from safly/patch-2
aaPanel Jul 3, 2019
ec2f101
Merge pull request #10 from safly/patch-1
aaPanel Jul 3, 2019
44a27bb
修正不能取消默认站点的问题
showpy Jul 3, 2019
9993886
Merge branch 'master' of https://github.com/aaPanel/BaoTa
showpy Jul 3, 2019
13095d6
优化BasicAuth响应头信息
showpy Jul 3, 2019
967092e
调整目录删除过程
showpy Jul 3, 2019
0387bd8
防止全选删除文件时将.user.ini误删
showpy Jul 3, 2019
fb7a77a
优化运行目录设置功能
showpy Jul 3, 2019
af1cbc5
修正覆盖提示的样式
showpy Jul 3, 2019
b347dc4
6.9.25
showpy Jul 3, 2019
73fe342
优化消息提示
showpy Jul 4, 2019
7e581cf
一键部署时.htaccess处理
showpy Jul 4, 2019
39776be
加强CSRF防御
showpy Jul 6, 2019
c00f83f
当修改用户名或密码时,强制要求其它会话重新登录
showpy Jul 8, 2019
274502b
重构了Let'sEncrypt一键部署模块
showpy Jul 10, 2019
2f2df26
6.9.26
showpy Jul 11, 2019
7e47105
备份数据库时自动获取字符集,兼容let's中文域名使用DNS-Api
showpy Jul 13, 2019
00acb06
6.9.27
showpy Jul 17, 2019
b2867aa
优化防盗链和一些小调整
showpy Jul 20, 2019
a0f56a6
调整依赖库版本
showpy Jul 20, 2019
fc93eed
6.9.28
showpy Jul 24, 2019
0c8553b
修正设置运行目录后导致SSL文件验证失败
showpy Jul 25, 2019
faf39a6
6.9.19
showpy Aug 1, 2019
22915ba
6.9.29
showpy Aug 1, 2019
7b01b41
6.9.30
showpy Aug 8, 2019
d72d20c
6.9.32
showpy Aug 26, 2019
f1b5935
6.9.33
showpy Aug 30, 2019
8372ff2
6.9.9
showpy Sep 4, 2019
1370874
6.9.9-2
showpy Sep 4, 2019
847f044
6.9.9-3
showpy Sep 5, 2019
6a5acc9
6.9.9-4
showpy Sep 6, 2019
b524357
6.9.36
showpy Sep 24, 2019
026712f
7.1.12
showpy Oct 16, 2019
fdba689
7.0.12-2
showpy Oct 16, 2019
6831ad7
7.0.2
showpy Oct 18, 2019
17cdd02
7.0.2-2
showpy Oct 19, 2019
c7fcfd1
7.0.14
showpy Oct 31, 2019
b534468
7.0.14-02
showpy Nov 1, 2019
b79853a
7.1.10
showpy Nov 16, 2019
e005dbf
7.1.11
showpy Nov 20, 2019
027c562
7.1.12
showpy Nov 28, 2019
b1d6185
7.1.13
showpy Dec 4, 2019
1f8da5c
7.1.14
showpy Dec 9, 2019
2f4fff5
7.1.15
showpy Dec 21, 2019
0a77a37
7.1.15
showpy Dec 21, 2019
20b6279
7.1.15-2
showpy Dec 21, 2019
8659709
7.1.15-3
showpy Dec 23, 2019
e99554b
7.1.16
showpy Jan 2, 2020
f776b5d
7.1.17
showpy Jan 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
269 changes: 0 additions & 269 deletions .gitignore

This file was deleted.

55 changes: 55 additions & 0 deletions BT-Panel
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/usr/bin/python
#coding: utf-8
# +-------------------------------------------------------------------
# | 宝塔Linux面板
# +-------------------------------------------------------------------
# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# +-------------------------------------------------------------------
# | Author: 黄文良 <287962566@qq.com>
# +-------------------------------------------------------------------
from gevent import monkey
monkey.patch_all()
import os,ssl
os.chdir('/www/server/panel')
from BTPanel import app,sys

if __name__ == '__main__':
f = open('data/port.pl')
PORT = int(f.read())
HOST = '0.0.0.0'
if os.path.exists('data/ipv6.pl'):
HOST = "0:0:0:0:0:0:0:0"
f.close()

#app.threaded=True
#app.jinja_env.auto_reload = True

from gevent.pywsgi import WSGIServer
from geventwebsocket.handler import WebSocketHandler

keyfile = 'ssl/privateKey.pem'
certfile = 'ssl/certificate.pem'
is_ssl = False
if os.path.exists('data/ssl.pl') and os.path.exists(keyfile) and os.path.exists(certfile):
is_ssl = True
if os.path.exists('data/debug.pl'):
ssl_context = None
if is_ssl: ssl_context=(certfile,keyfile)
app.run(host=HOST,port=PORT,threaded=True,debug=True,ssl_context=ssl_context)
else:
if is_ssl:
my_ssl = {
'certfile': certfile,
'keyfile': keyfile,
'ciphers': 'ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE',
'ssl_version':ssl.OP_NO_SSLv3,
'suppress_ragged_eofs':False
}
ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
ssl_context.load_cert_chain(certfile=certfile,keyfile=keyfile)
ssl_context.options &= ~ssl.OP_NO_SSLv3

http_server = WSGIServer((HOST, PORT), app,handler_class=WebSocketHandler,ssl_context = ssl_context)
else:
http_server = WSGIServer((HOST, PORT), app,handler_class=WebSocketHandler)
http_server.serve_forever()
Loading