bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-04-21 19:52:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: fix typo

Browse Source
This commit is contained in:
nadoo 2020-09-27 00:08:16 +08:00
parent 72a2782395
commit 3d61be2819
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipset/ipset_linux.go
View File

@ -5,9 +5,9 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/nadoo/glider/rule" "github.com/nadoo/ipset"
ipsetlib "github.com/nadoo/ipset" "github.com/nadoo/glider/rule"
) )
// Manager struct. // Manager struct.
@ -17,7 +17,7 @@ type Manager struct {
// NewManager returns a Manager // NewManager returns a Manager
func NewManager(rules []*rule.Config) (*Manager, error) { func NewManager(rules []*rule.Config) (*Manager, error) {
if err := ipsetlib.Init(); err != nil { if err := ipset.Init(); err != nil {
return nil, err return nil, err
} }
@ -30,8 +30,8 @@ func NewManager(rules []*rule.Config) (*Manager, error) {
} }
for set := range sets { for set := range sets {
ipsetlib.Create(set) ipset.Create(set)
ipsetlib.Flush(set) ipset.Flush(set)
} }
// init ipset // init ipset
@ -42,10 +42,10 @@ func NewManager(rules []*rule.Config) (*Manager, error) {
m.domainSet.Store(domain, r.IPSet) m.domainSet.Store(domain, r.IPSet)
} }
for _, ip := range r.IP { for _, ip := range r.IP {
ipsetlib.Add(r.IPSet, ip) ipset.Add(r.IPSet, ip)
} }
for _, cidr := range r.CIDR { 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) domain = strings.ToLower(domain)
for i := len(domain); i != -1; { for i := len(domain); i != -1; {
i = strings.LastIndexByte(domain[:i], '.') i = strings.LastIndexByte(domain[:i], '.')
if ipset, ok := m.domainSet.Load(domain[i+1:]); ok { if setName, ok := m.domainSet.Load(domain[i+1:]); ok {
ipsetlib.Add(ipset.(string), ip) ipset.Add(setName.(string), ip)
} }
} }

4
systemd/README.md
View File

@ -15,7 +15,7 @@ cp glider /usr/bin/
cp systemd/glider@.service /etc/systemd/system/ cp systemd/glider@.service /etc/systemd/system/
``` ```
#### 3. add config file: ***server***.conf #### 3. add config file: ***glider***.conf
```bash ```bash
# copy config file to /etc/glider/ # copy config file to /etc/glider/
@ -23,7 +23,7 @@ mkdir /etc/glider/
cp ./config/glider.conf.example /etc/glider/glider.conf cp ./config/glider.conf.example /etc/glider/glider.conf
``` ```
#### 4. enable and start service: glider@***server*** #### 4. enable and start service: glider@***glider***
```bash ```bash
# enable and start service # enable and start service