Use YAML instead of JSON for server configuration file

[govpn.git] / src / govpn / cmd / govpn-server / conf.go

diff --git a/src/govpn/cmd/govpn-server/conf.go b/src/govpn/cmd/govpn-server/conf.go
index 36681078b565978fab4731b26aaf51a66d05b541..00fa7c851e5b109bbecc4b0b4db8f449341f953d 100644 (file)
--- 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
        }