X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fgovpn%2Fcmd%2Fgovpn-server%2Fconf.go;h=00fa7c851e5b109bbecc4b0b4db8f449341f953d;hb=a5872551bfa75d7efde5a186c7ff2de2e3bb8449;hp=36681078b565978fab4731b26aaf51a66d05b541;hpb=867a8de03177abf0a5d678e6ce5cf0d0963ca207;p=govpn.git

diff --git a/src/govpn/cmd/govpn-server/conf.go b/src/govpn/cmd/govpn-server/conf.go
index 3668107..00fa7c8 100644
--- a/src/govpn/cmd/govpn-server/conf.go
+++ b/src/govpn/cmd/govpn-server/conf.go
@@ -19,12 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"log"
 	"time"
 
+	"github.com/go-yaml/yaml"
+
 	"govpn"
 )
 
@@ -43,7 +44,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
 		return nil, err
 	}
 	confsRaw := new(map[string]govpn.PeerConf)
-	err = json.Unmarshal(data, confsRaw)
+	err = yaml.Unmarshal(data, confsRaw)
 	if err != nil {
 		return nil, err
 	}