mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-12 10:31:52 +00:00
Code Issues Releases Wiki Activity

Fix Debian packages and more log

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-04 14:52:04 +01:00
parent 681c6f0844
commit a082f96faa
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -9,7 +9,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install dependencies - name: install dependencies
run: sudo apt-get install debhelper python3 python3-distutils-extra run: sudo apt-get install debhelper python3 python3-distutils-extra dh-python
- name: Build Debian package - name: Build Debian package
run: dpkg-buildpackage -b -us -uc run: dpkg-buildpackage -b -us -uc

2
debian/control vendored
View file

@ -2,7 +2,7 @@ Source: omr-vps-admin
Section: net Section: net
Priority: optional Priority: optional
Maintainer: OpenMPTCProuter <contact@openmptcprouter.com> Maintainer: OpenMPTCProuter <contact@openmptcprouter.com>
Build-Depends: debhelper (>= 10), python3, python3-distutils-extra Build-Depends: debhelper (>= 10), python3, python3-distutils-extra, dh-python
X-Python-Version: >= 3.2 X-Python-Version: >= 3.2
Standards-Version: 0.0.1 Standards-Version: 0.0.1
Homepage: https://github.com/ysurac/openmptcprouter-vps-admin Homepage: https://github.com/ysurac/openmptcprouter-vps-admin

12
omr-admin.py
View file

@ -2116,7 +2116,7 @@ def wireguard(*, params: WireGuard, current_user: User = Depends(get_current_use
os.system("wg setconf wg0 /etc/wireguard/wg0.conf") os.system("wg setconf wg0 /etc/wireguard/wg0.conf")
shorewall_add_port(current_user, str(wg_port), 'udp', 'wireguard') shorewall_add_port(current_user, str(wg_port), 'udp', 'wireguard')
set_lastchange() set_lastchange()
return {'result': 'done'} return {'result': 'done', 'reason': 'changes applied', 'route': 'wireguard'}
class Wanips(BaseModel): class Wanips(BaseModel):
@ -2134,7 +2134,7 @@ def wan(*, wanips: Wanips, current_user: User = Depends(get_current_user)):
outfile.write(ips) outfile.write(ips)
final_md5 = hashlib.md5(file_as_bytes(open('/etc/shadowsocks-libev/local.acl', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/shadowsocks-libev/local.acl', 'rb'))).hexdigest()
#modif_config_user(current_user.username,{'wanips': wanip}) #modif_config_user(current_user.username,{'wanips': wanip})
return {'result': 'done'} return {'result': 'done', 'reason': 'changes applied', 'route': 'wan'}
class Lanips(BaseModel): class Lanips(BaseModel):
lanips: List[str] = [] lanips: List[str] = []
@ -2170,7 +2170,7 @@ def lan(*, lanconfig: Lanips, current_user: User = Depends(get_current_user)):
if initial_md5 != final_md5: if initial_md5 != final_md5:
os.system("systemctl -q restart openvpn@tun0") os.system("systemctl -q restart openvpn@tun0")
set_lastchange() set_lastchange()
return {'result': 'done', 'reason': 'changes applied'} return {'result': 'done', 'reason': 'changes applied', 'route': 'lan'}
class VPNips(BaseModel): class VPNips(BaseModel):
remoteip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$') remoteip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$')
@ -2255,7 +2255,7 @@ def vpnips(*, vpnconfig: VPNips, current_user: User = Depends(get_current_user))
os.system("systemctl -q reload shorewall6") os.system("systemctl -q reload shorewall6")
set_lastchange() set_lastchange()
return {'result': 'done', 'reason': 'changes applied'} return {'result': 'done', 'reason': 'changes applied', 'route': 'vpnips'}
# Update VPS # Update VPS
@app.get('/update', summary="Update VPS script") @app.get('/update', summary="Update VPS script")
@ -2267,7 +2267,7 @@ def update(current_user: User = Depends(get_current_user)):
os.system("wget -O - http://www.openmptcprouter.com/server/debian10-x86_64.sh | sh &") os.system("wget -O - http://www.openmptcprouter.com/server/debian10-x86_64.sh | sh &")
LOG.debug("Update VPS... done") LOG.debug("Update VPS... done")
os.system("/sbin/reboot") os.system("/sbin/reboot")
return {'result': 'done'} return {'result': 'done', 'route': 'update'}
# Backup # Backup
class Backupfile(BaseModel): class Backupfile(BaseModel):
@ -2282,7 +2282,7 @@ def backuppost(*, backupfile: Backupfile, current_user: User = Depends(get_curre
return {'result': 'error', 'reason': 'Invalid parameters', 'route': 'backuppost'} return {'result': 'error', 'reason': 'Invalid parameters', 'route': 'backuppost'}
with open('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz', 'wb') as f: with open('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz', 'wb') as f:
f.write(base64.b64decode(backup_file)) f.write(base64.b64decode(backup_file))
return {'result': 'done'} return {'result': 'done', 'route': 'backuppost'}
@app.get('/backupget', summary="Get current user router backup file") @app.get('/backupget', summary="Get current user router backup file")
def send_backup(current_user: User = Depends(get_current_user)): def send_backup(current_user: User = Depends(get_current_user)):