diff --git a/ipset/ipset_linux.go b/ipset/ipset_linux.go index 04693fd..b5e0111 100644 --- a/ipset/ipset_linux.go +++ b/ipset/ipset_linux.go @@ -5,9 +5,9 @@ import ( "strings" "sync" - "github.com/nadoo/glider/rule" + "github.com/nadoo/ipset" - ipsetlib "github.com/nadoo/ipset" + "github.com/nadoo/glider/rule" ) // Manager struct. @@ -17,7 +17,7 @@ type Manager struct { // NewManager returns a Manager func NewManager(rules []*rule.Config) (*Manager, error) { - if err := ipsetlib.Init(); err != nil { + if err := ipset.Init(); err != nil { return nil, err } @@ -30,8 +30,8 @@ func NewManager(rules []*rule.Config) (*Manager, error) { } for set := range sets { - ipsetlib.Create(set) - ipsetlib.Flush(set) + ipset.Create(set) + ipset.Flush(set) } // init ipset @@ -42,10 +42,10 @@ func NewManager(rules []*rule.Config) (*Manager, error) { m.domainSet.Store(domain, r.IPSet) } for _, ip := range r.IP { - ipsetlib.Add(r.IPSet, ip) + ipset.Add(r.IPSet, ip) } for _, cidr := range r.CIDR { - ipsetlib.Add(r.IPSet, cidr) + ipset.Add(r.IPSet, cidr) } } } @@ -62,8 +62,8 @@ func (m *Manager) AddDomainIP(domain, ip string) error { domain = strings.ToLower(domain) for i := len(domain); i != -1; { i = strings.LastIndexByte(domain[:i], '.') - if ipset, ok := m.domainSet.Load(domain[i+1:]); ok { - ipsetlib.Add(ipset.(string), ip) + if setName, ok := m.domainSet.Load(domain[i+1:]); ok { + ipset.Add(setName.(string), ip) } } diff --git a/systemd/README.md b/systemd/README.md index d646a10..e6815a7 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -15,7 +15,7 @@ cp glider /usr/bin/ cp systemd/glider@.service /etc/systemd/system/ ``` -#### 3. add config file: ***server***.conf +#### 3. add config file: ***glider***.conf ```bash # copy config file to /etc/glider/ @@ -23,7 +23,7 @@ mkdir /etc/glider/ cp ./config/glider.conf.example /etc/glider/glider.conf ``` -#### 4. enable and start service: glider@***server*** +#### 4. enable and start service: glider@***glider*** ```bash # enable and start service