ua1zbe
/
hbnet2
mirror of https://github.com/kf7eel/hbnet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add PROXY to generation script

This commit is contained in:
KF7EEL 2021-09-01 16:23:02 -07:00
parent d347c72e3d
commit 3678ca107e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app.py
View File

@ -1381,9 +1381,10 @@ def create_app():
ml = MasterList.query.filter_by(public_list=True).filter_by(active=True).all() ml = MasterList.query.filter_by(public_list=True).filter_by(active=True).all()
pl = ProxyList.query.filter_by(public_list=True).filter_by(active=True).all() pl = ProxyList.query.filter_by(public_list=True).filter_by(active=True).all()
## print(ml) print(ml)
print(pl)
for m in ml: for m in ml:
## print(m.name) print(m.name)
## print(m.server) ## print(m.server)
## print(m.port) ## print(m.port)
## print(m.enable_um) ## print(m.enable_um)
@ -1393,6 +1394,12 @@ def create_app():
if m.enable_um == True: if m.enable_um == True:
passp = passphrase passp = passphrase
pub_list.append([m.server + '_' + m.name, sl.ip, passphrase, m.port]) pub_list.append([m.server + '_' + m.name, sl.ip, passphrase, m.port])
for p in pl:
sl = ServerList.query.filter_by(name=m.server).first()
if p.enable_um == True:
passp = passphrase
pub_list.append([p.server + '_' + p.name, sl.ip, passphrase, p.external_port])
return str(gen_script(dmr_id, pub_list)) return str(gen_script(dmr_id, pub_list))