From 909dc3fb2dd1338902fbf0f359405ec7f7b96950 Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Mon, 13 Mar 2017 16:43:56 +0100 Subject: [PATCH 1/2] added absolute path to birdc and birdc6 in default config --- etc/ecix/birdwatcher.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/ecix/birdwatcher.conf b/etc/ecix/birdwatcher.conf index a2c828a..ec81bef 100644 --- a/etc/ecix/birdwatcher.conf +++ b/etc/ecix/birdwatcher.conf @@ -42,13 +42,13 @@ requests_per_minute = 10 [bird] listen = "0.0.0.0:29188" config = "/etc/bird.conf" -birdc = "birdc" +birdc = "/sbin/birdc" [bird6] listen = "0.0.0.0:29189" config = "/etc/bird6.conf" -birdc = "birdc6" +birdc = "/sbin/birdc6" [parser] # Remove fields e.g. interface From 13e145f8a2829d53da0f133f62174b479089b92d Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Mon, 13 Mar 2017 16:44:37 +0100 Subject: [PATCH 2/2] be a bit more specific on which configs are being used --- config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.go b/config.go index 97024e9..8a5c394 100644 --- a/config.go +++ b/config.go @@ -4,6 +4,7 @@ package main import ( "fmt" + "log" "strings" "github.com/BurntSushi/toml" @@ -42,6 +43,7 @@ func LoadConfigs(configFiles []string) (*Config, error) { if err != nil { continue } else { + log.Println("Using config file:", filename) hasConfig = true // Merge configs if err := mergo.Merge(config, tmp); err != nil {