diff --git a/.claude/settings.local.json b/.claude/settings.local.json index a10b6fe..73a7907 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -54,7 +54,8 @@ "Bash(git stash drop:*)", "Bash(git remote set-url:*)", "WebFetch(domain:iphostmonitor.com)", - "WebFetch(domain:mibbrowser.online)" + "WebFetch(domain:mibbrowser.online)", + "Bash(pip3 install:*)" ] } } diff --git a/.gitignore b/.gitignore index 45ce5b5..6081c90 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ log *.swp *.swo *~ +cert.pem +key.pem diff --git a/cmd/tendrils/main.go b/cmd/tendrils/main.go index 91f39ef..66fe878 100644 --- a/cmd/tendrils/main.go +++ b/cmd/tendrils/main.go @@ -8,7 +8,7 @@ import ( func main() { iface := flag.String("i", "", "interface to use") - configFile := flag.String("config", "", "path to YAML config file") + configFile := flag.String("config", "config.yaml", "path to YAML config file") noARP := flag.Bool("no-arp", false, "disable ARP discovery") noLLDP := flag.Bool("no-lldp", false, "disable LLDP discovery") noSNMP := flag.Bool("no-snmp", false, "disable SNMP discovery") @@ -31,7 +31,6 @@ func main() { debugBMD := flag.Bool("debug-bmd", false, "debug Blackmagic discovery") debugShure := flag.Bool("debug-shure", false, "debug Shure discovery") debugYamaha := flag.Bool("debug-yamaha", false, "debug Yamaha discovery") - enableHTTPS := flag.Bool("https", false, "enable HTTPS server on port 443") flag.Parse() t := tendrils.New() @@ -59,6 +58,5 @@ func main() { t.DebugBMD = *debugBMD t.DebugShure = *debugShure t.DebugYamaha = *debugYamaha - t.EnableHTTPS = *enableHTTPS t.Run() } diff --git a/config.yaml b/config.yaml index 6a40c1a..f04c3ea 100644 --- a/config.yaml +++ b/config.yaml @@ -8,7 +8,12 @@ locations: - lighting-2 - "48:59:00:41:00:29" # Pixie Driver 8k Port 1 - "48:59:00:28:00:27" # Pixie Driver 8k Port 2 + - "48:59:00:43:00:29" # Pixie Driver 8k Port 3 + - "48:59:00:42:00:29" # Pixie Driver 8k Port 4 - "48:59:00:3c:00:3e" # Pixie Driver 8k Port 5 + - "48:59:00:3f:00:3e" # Pixie Driver 8k Port 6 + - "48:59:00:25:00:3e" # Pixie Driver 8k Port 7 + - "48:59:00:41:00:3e" # Pixie Driver 8k Port 8 - ART9 # Cyc - ART10 # Cyc - ART11 # Cyc @@ -140,6 +145,7 @@ locations: - name: Sound Control nodes: - SQ-7 + - "00:04:c4:15:07:a4" # SQ-7 bridge port - BT - name: Camera Control diff --git a/http.go b/http.go index d28f766..49f4df0 100644 --- a/http.go +++ b/http.go @@ -32,10 +32,6 @@ type StatusResponse struct { } func (t *Tendrils) startHTTPServer() { - if !t.EnableHTTPS { - return - } - if err := ensureCert(); err != nil { log.Printf("[ERROR] failed to ensure certificate: %v", err) return diff --git a/tendrils.go b/tendrils.go index 5c1642f..0e411ef 100644 --- a/tendrils.go +++ b/tendrils.go @@ -60,7 +60,6 @@ type Tendrils struct { DebugBMD bool DebugShure bool DebugYamaha bool - EnableHTTPS bool } func New() *Tendrils { @@ -101,10 +100,9 @@ func (t *Tendrils) Run() { cfg, err := LoadConfig(t.ConfigFile) if err != nil { - log.Printf("[ERROR] failed to load config: %v", err) - } else { - t.config = cfg + log.Fatalf("[ERROR] failed to load config: %v", err) } + t.config = cfg t.populateLocalAddresses() t.startHTTPServer()