diff --git a/go.mod b/go.mod index 7b7dc57..deb6f61 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ replace ( ) require ( + asciigoat.org/ini v0.0.0-20230829154357-1dd7cb19a8c1 darvaza.org/core v0.9.5 darvaza.org/resolver v0.5.2 darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf @@ -17,11 +18,11 @@ require ( github.com/mgechev/revive v1.3.3 github.com/spf13/cobra v1.7.0 golang.org/x/crypto v0.12.0 - gopkg.in/gcfg.v1 v1.2.3 gopkg.in/yaml.v3 v3.0.1 ) require ( + asciigoat.org/core v0.3.4 // indirect darvaza.org/slog/handlers/filter v0.4.4 // indirect darvaza.org/slog/handlers/zerolog v0.4.4 // indirect github.com/BurntSushi/toml v1.3.2 // indirect @@ -45,5 +46,4 @@ require ( golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.12.0 // indirect - gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 9325ff6..2ba5e41 100644 --- a/go.sum +++ b/go.sum @@ -92,10 +92,6 @@ golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/wireguard/config.go b/pkg/wireguard/config.go index a036b4b..0286c03 100644 --- a/pkg/wireguard/config.go +++ b/pkg/wireguard/config.go @@ -10,8 +10,8 @@ import ( "strings" "text/template" + "asciigoat.org/ini" "darvaza.org/core" - "gopkg.in/gcfg.v1" ) var configTemplate = template.Must(template.New("config").Funcs(template.FuncMap{ @@ -251,7 +251,7 @@ func (v *intermediateConfig) PeersCount() (int, bool) { func NewConfigFromReader(r io.Reader) (*Config, error) { temp := &intermediateConfig{} - if err := gcfg.ReadInto(temp, r); err != nil { + if err := ini.ReadInto(temp, r); err != nil { return nil, err }