Only use YAML binding version 2.

https://github.com/go-yaml/yaml#api-documentation

diff --git a/.gitmodules b/.gitmodules
index 82df1f7e8a594fcda48fccdf6d3c937b356e89fb..c837a039e17a5ea45e75cc416ebcd3cbe97f1dda 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,10 @@
 [submodule "src/golang.org/x/crypto"]
        path = src/golang.org/x/crypto
        url = https://go.googlesource.com/crypto
-[submodule "src/github.com/go-yaml/yaml"]
-       path = src/github.com/go-yaml/yaml
-       url = https://github.com/go-yaml/yaml.git
 [submodule "src/cypherpunks.ru/balloon"]
        path = src/cypherpunks.ru/balloon
        url = git://git.cypherpunks.ru/balloon.git
+[submodule "src/gopkg.in/yaml.v2"]
+       path = src/gopkg.in/yaml.v2
+       url = https://github.com/go-yaml/yaml.git
+       branch = v2

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
index ea61c813f22494be3b469b9736f24c99ef436df6..7c63f65810a93dc8452098783919dfc9c2736b58 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
@@ -24,7 +24,7 @@ import (
        "log"
        "time"
 
-       "github.com/go-yaml/yaml"
+       "gopkg.in/yaml.v2"
 
        "cypherpunks.ru/govpn"
 )

diff --git a/src/github.com/go-yaml/yaml b/src/github.com/go-yaml/yaml
deleted file mode 160000 (submodule)
index e4d366f..0000000
--- a/src/github.com/go-yaml/yaml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e4d366fc3c7938e2958e662b4258c7a89e1f0e3e

diff --git a/src/gopkg.in/yaml.v2 b/src/gopkg.in/yaml.v2
new file mode 160000 (submodule)
index 0000000..a5b47d3
--- /dev/null
+++ b/src/gopkg.in/yaml.v2
@@ -0,0 +1 @@
+Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0