highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-11-23 20:37:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

string replacement changed

Browse Source
This commit is contained in:
Christian Rotzoll
2019-04-02 01:40:14 +01:00
parent 8bfb11b63e
commit e5406ca5b8
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ if sys.argv[1] == "on":
# check if already running # check if already running
already_running = subprocess.check_output("systemctl is-enabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True) already_running = subprocess.check_output("systemctl is-enabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True)
print(already_running)
if str(already_running).count("enabled") > 0: if str(already_running).count("enabled") > 0:
print("already ON - run 'internet.sshtunnel.py off' first") print("already ON - run 'internet.sshtunnel.py off' first")
sys.exit(1) sys.exit(1)
@@ -47,7 +48,7 @@ if sys.argv[1] == "on":
# check server address # check server address
ssh_server = sys.argv[2] ssh_server = sys.argv[2]
if ssh_server.count("@") != 1: if ssh_server.count("@") != 1:
print(f"[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help") print("[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help")
sys.exit(1) sys.exit(1)
# check minimal forwardings # check minimal forwardings
@@ -62,7 +63,7 @@ if sys.argv[1] == "on":
# check forwarding format # check forwarding format
if sys.argv[i].count(":") != 1: if sys.argv[i].count(":") != 1:
print(f"[INTERNAL-PORT]:[EXTERNAL-PORT] wrong format '{sys.argv[i]}'") print("[INTERNAL-PORT]:[EXTERNAL-PORT] wrong format '%s'" % (sys.argv[i]))
sys.exit(1) sys.exit(1)
# get ports # get ports
@@ -70,13 +71,13 @@ if sys.argv[1] == "on":
port_internal = ports[0] port_internal = ports[0]
port_external = ports[1] port_external = ports[1]
if port_internal.isdigit() == False: if port_internal.isdigit() == False:
print(f"[INTERNAL-PORT]:[EXTERNAL-PORT] internal not number '{sys.argv[i]}'") print(f"[INTERNAL-PORT]:[EXTERNAL-PORT] internal not number '%s'" % (sys.argv[i]))
sys.exit(1) sys.exit(1)
if port_external.isdigit() == False: if port_external.isdigit() == False:
print(f"[INTERNAL-PORT]:[EXTERNAL-PORT] external not number '{sys.argv[i]}'") print(f"[INTERNAL-PORT]:[EXTERNAL-PORT] external not number '%s'" % (sys.argv[i]))
sys.exit(1) sys.exit(1)
additional_parameters= additional_parameters + f"-R {port_external}:localhost:{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)
@@ -98,14 +99,14 @@ if sys.argv[1] == "on":
# enable service # enable service
print(f"*** Enabling systemd service: {{SERVICENAME}}") print(f"*** Enabling systemd service: {{SERVICENAME}}")
subprocess.call(f"systemctl daemon-reload", shell=True) subprocess.call(f"systemctl daemon-reload", shell=True)
subprocess.call(f"systemctl enable {SERVICENAME}", shell=True) #subprocess.call(f"systemctl enable {SERVICENAME}", shell=True)
print() print()
# final info (can be ignored if run by other script) # final info (can be ignored if run by other script)
print(f"*** OK - SSH TUNNEL SERVICE STARTED ***") print(f"*** OK - SSH TUNNEL SERVICE STARTED ***")
print(f"- Make sure the SSH pub key of this RaspiBlitz is in 'authorized_keys' of {} ") print(f"- Make sure the SSH pub key of this RaspiBlitz is in 'authorized_keys' of {} ")
print(f"- Tunnel service needs final reboot to start.") print(f"- Tunnel service needs final reboot to start.")
print(f"- After reboot check logs: sudo journalctl -f -u {SERVICENAME}") #print(f"- After reboot check logs: sudo journalctl -f -u {SERVICENAME}")
# #
# SWITCHING OFF # SWITCHING OFF
@@ -114,10 +115,10 @@ if sys.argv[1] == "on":
elif sys.argv[1] == "off": elif sys.argv[1] == "off":
# check if already disabled # check if already disabled
alreadyRunning = subprocess.check_output(f"systemctl is-enabled {SERVICENAME}" ,shell=True, universal_newlines=True) #alreadyRunning = subprocess.check_output(f"systemctl is-enabled {SERVICENAME}" ,shell=True, universal_newlines=True)
if str(alreadyRunning).count("enabled") == 0: #if str(alreadyRunning).count("enabled") == 0:
print("Was already OFF") # print("Was already OFF")
sys.exit(0) # sys.exit(0)
print ("TODO: Switch OFF") print ("TODO: Switch OFF")