From afc3f8a25db0b1eab542afac67bb3f276c80f6dd Mon Sep 17 00:00:00 2001
From: Matthias Hannig <matthias@hannig.cc>
Date: Wed, 30 Nov 2016 12:56:54 +0100
Subject: [PATCH] moved config files

---
 .gitignore                |  2 ++
 birdwatcher.go            |  6 +++---
 etc/ecix/birdwatcher.conf | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 etc/ecix/birdwatcher.conf

diff --git a/.gitignore b/.gitignore
index 251ae28..c16085f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ birdwatcher
 birdwatcher-*
 
 DIST/
+
+*.local.*
diff --git a/birdwatcher.go b/birdwatcher.go
index 8540d5a..bf3b1ed 100644
--- a/birdwatcher.go
+++ b/birdwatcher.go
@@ -43,9 +43,9 @@ func main() {
 
 	// Load configurations
 	conf, err := LoadConfigs([]string{
-		"./etc/birdwatcher/birdwatcher.conf",
-		"/etc/birdwatcher/birdwatcher.conf",
-		"./etc/birdwatcher/birdwatcher.local.conf",
+		"./etc/ecix/birdwatcher.conf",
+		"/etc/ecix/birdwatcher.conf",
+		"./etc/ecix/birdwatcher.local.conf",
 	})
 
 	if err != nil {
diff --git a/etc/ecix/birdwatcher.conf b/etc/ecix/birdwatcher.conf
new file mode 100644
index 0000000..a2e1969
--- /dev/null
+++ b/etc/ecix/birdwatcher.conf
@@ -0,0 +1,35 @@
+
+
+#
+# Birdwatcher Configuration
+#
+
+[server]
+# Restrict access to certain IPs. Leave empty to allow from all. 
+allow_from = []
+
+
+[status]
+#
+# Where to get the reconfigure timestamp from:
+# Available sources: bird, config_regex, config_modified
+#
+reconfig_timestamp_source = "bird"
+reconfig_timestamp_match = "# Created (.*)"
+
+# Remove fields e.g. uptime
+filter_fields = []
+
+
+[bird]
+listen = "0.0.0.0:29184"
+config = "/etc/bird.conf"
+birdc  = "birdc"
+
+
+[bird6]
+listen = "0.0.0.0:29185"
+config = "/etc/bird6.conf"
+birdc  = "birdc6"
+
+