Remove autossh reverse tunnel references — module deleted, causing ImportError on startup
This commit is contained in:
@@ -4,7 +4,6 @@ from modules.connectivity.wireguard import WireGuard
|
|||||||
from modules.connectivity.tailscale import Tailscale
|
from modules.connectivity.tailscale import Tailscale
|
||||||
from modules.connectivity.bridge import Bridge
|
from modules.connectivity.bridge import Bridge
|
||||||
from modules.connectivity.wifi_client import WiFiClient
|
from modules.connectivity.wifi_client import WiFiClient
|
||||||
from modules.connectivity.reverse_tunnel import ReverseTunnel
|
|
||||||
from modules.connectivity.cellular_backup import CellularBackup
|
from modules.connectivity.cellular_backup import CellularBackup
|
||||||
from modules.connectivity.ble_emergency import BLEEmergency
|
from modules.connectivity.ble_emergency import BLEEmergency
|
||||||
from modules.connectivity.data_exfil import DataExfil
|
from modules.connectivity.data_exfil import DataExfil
|
||||||
@@ -14,7 +13,6 @@ __all__ = [
|
|||||||
"Tailscale",
|
"Tailscale",
|
||||||
"Bridge",
|
"Bridge",
|
||||||
"WiFiClient",
|
"WiFiClient",
|
||||||
"ReverseTunnel",
|
|
||||||
"CellularBackup",
|
"CellularBackup",
|
||||||
"BLEEmergency",
|
"BLEEmergency",
|
||||||
"DataExfil",
|
"DataExfil",
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ class BLEEmergency(BaseModule):
|
|||||||
all_status = self.state.get_all_module_status()
|
all_status = self.state.get_all_module_status()
|
||||||
connectivity_modules = {}
|
connectivity_modules = {}
|
||||||
for name, info in all_status.items():
|
for name, info in all_status.items():
|
||||||
if name in ("wireguard", "tailscale", "reverse_tunnel", "cellular_backup"):
|
if name in ("wireguard", "tailscale", "cellular_backup"):
|
||||||
connectivity_modules[name] = info.get("status", "unknown")
|
connectivity_modules[name] = info.get("status", "unknown")
|
||||||
status_data["connectivity"] = connectivity_modules
|
status_data["connectivity"] = connectivity_modules
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class ExfilJob:
|
|||||||
|
|
||||||
|
|
||||||
# Connectivity chain — tried in order of preference
|
# Connectivity chain — tried in order of preference
|
||||||
CONNECTIVITY_CHAIN = ["wireguard", "tailscale", "reverse_tunnel", "cellular_backup"]
|
CONNECTIVITY_CHAIN = ["wireguard", "tailscale", "cellular_backup"]
|
||||||
|
|
||||||
NIGHTLY_HOUR = 2 # 2 AM local time for nightly sync
|
NIGHTLY_HOUR = 2 # 2 AM local time for nightly sync
|
||||||
MAX_ATTEMPTS = 5
|
MAX_ATTEMPTS = 5
|
||||||
@@ -425,9 +425,6 @@ class DataExfil(BaseModule):
|
|||||||
ts_cfg = self.config.get("connectivity", {}).get("tailscale", {})
|
ts_cfg = self.config.get("connectivity", {}).get("tailscale", {})
|
||||||
return ts_cfg.get("operator_ip")
|
return ts_cfg.get("operator_ip")
|
||||||
|
|
||||||
elif via_module == "reverse_tunnel":
|
|
||||||
# Reverse tunnel goes through localhost (port is forwarded)
|
|
||||||
return "127.0.0.1"
|
|
||||||
|
|
||||||
elif via_module == "cellular_backup":
|
elif via_module == "cellular_backup":
|
||||||
# Cellular uses a separate relay
|
# Cellular uses a separate relay
|
||||||
|
|||||||
@@ -270,7 +270,6 @@ CONNECTIVITY_MODULE_DOTTED = [
|
|||||||
"modules.connectivity.tailscale",
|
"modules.connectivity.tailscale",
|
||||||
"modules.connectivity.bridge",
|
"modules.connectivity.bridge",
|
||||||
"modules.connectivity.wifi_client",
|
"modules.connectivity.wifi_client",
|
||||||
"modules.connectivity.reverse_tunnel",
|
|
||||||
"modules.connectivity.cellular_backup",
|
"modules.connectivity.cellular_backup",
|
||||||
"modules.connectivity.ble_emergency",
|
"modules.connectivity.ble_emergency",
|
||||||
"modules.connectivity.data_exfil",
|
"modules.connectivity.data_exfil",
|
||||||
@@ -281,7 +280,6 @@ CONNECTIVITY_CLASS_NAMES = [
|
|||||||
"Tailscale",
|
"Tailscale",
|
||||||
"Bridge",
|
"Bridge",
|
||||||
"WiFiClient",
|
"WiFiClient",
|
||||||
"ReverseTunnel",
|
|
||||||
"CellularBackup",
|
"CellularBackup",
|
||||||
"BLEEmergency",
|
"BLEEmergency",
|
||||||
"DataExfil",
|
"DataExfil",
|
||||||
|
|||||||
Reference in New Issue
Block a user