mirror of
https://github.com/alice-lg/birdwatcher.git
synced 2025-03-09 00:00:05 +01:00
Merge branch 'master' into gzip-support
This commit is contained in:
commit
26ad54c61f
2 changed files with 4 additions and 2 deletions
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue