highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-10-10 12:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix ssh ports value

Browse Source
This commit is contained in:
Christian Rotzoll
2019-04-02 22:28:59 +01:00
parent 31a09f389e
commit 4c2d31620c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
home.admin/config.scripts/internet.sshtunnel.py
View File

@@ -4,13 +4,13 @@ import sys, subprocess, re
from pathlib import Path from pathlib import Path
# IDEA: At the momemt its just Reverse-SSh Tunnels thats why [INTERNAL-PORT]<[EXTERNAL-PORT] # IDEA: At the momemt its just Reverse-SSh Tunnels thats why [INTERNAL-PORT]<[EXTERNAL-PORT]
# For the future also just local ssh tunnels could be added with [INTERNAL-PORT]>[EXTERNAL-PORT] # For the future also just local ssh tunnels could be added with [INTERNAL-PORT]-[EXTERNAL-PORT]
# for the use case when a server wants to use a RaspiBlitz behind a NAT as Lightning backend # for the use case when a server wants to use a RaspiBlitz behind a NAT as Lightning backend
# display config script info # display config script info
if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help": if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help":
print("forward ports from another server to raspiblitz with reverse SSH tunnel") print("forward ports from another server to raspiblitz with reverse SSH tunnel")
print("internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] [INTERNAL-PORT]<[EXTERNAL-PORT]") print("internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] \"[INTERNAL-PORT]<[EXTERNAL-PORT]\"")
print("note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings") print("note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings")
sys.exit(1) sys.exit(1)
@@ -56,9 +56,8 @@ if sys.argv[1] == "on":
# check if already running # check if already running
isRunning = subprocess.getoutput("sudo systemctl --no-pager | grep '%s' -c" % (SERVICENAME)) isRunning = subprocess.getoutput("sudo systemctl --no-pager | grep '%s' -c" % (SERVICENAME))
print(isRunning)
if int(isRunning) > 1: if int(isRunning) > 1:
print("already ON - run 'internet.sshtunnel.py off' first") print("SSH TUNNEL ALREADY ACTIVATED - run 'internet.sshtunnel.py off' first to set new tunnel")
sys.exit(1) sys.exit(1)
# check server address # check server address
@@ -72,8 +71,9 @@ if sys.argv[1] == "on":
# genenate additional parameter for autossh (forwarding ports) # genenate additional parameter for autossh (forwarding ports)
if len(sys.argv) < 4: if len(sys.argv) < 4:
print("[INTERNAL-PORT]<[EXTERNAL-PORT] missing - run 'internet.sshtunnel.py off' first") print("[INTERNAL-PORT]<[EXTERNAL-PORT] missing")
sys.exit(1) sys.exit(1)
ssh_ports=""
additional_parameters="" additional_parameters=""
i = 3 i = 3
while i < len(sys.argv): while i < len(sys.argv):
@@ -94,11 +94,12 @@ if sys.argv[1] == "on":
print("[INTERNAL-PORT]<[EXTERNAL-PORT] external not number '%s'" % (sys.argv[i])) print("[INTERNAL-PORT]<[EXTERNAL-PORT] external not number '%s'" % (sys.argv[i]))
sys.exit(1) sys.exit(1)
ssh_ports = ssh_ports + "\"%s\" " % (sys.argv[i])
additional_parameters= additional_parameters + "-R %s:localhost:%s " % (port_external,port_internal) additional_parameters= additional_parameters + "-R %s:localhost:%s " % (port_external,port_internal)
i=i+1 i=i+1
# genenate additional parameter for autossh (server) # genenate additional parameter for autossh (server)
ssh_ports= additional_parameters.strip() ssh_ports = ssh_ports.strip()
additional_parameters= additional_parameters + ssh_server additional_parameters= additional_parameters + ssh_server
# generate custom service config # generate custom service config