Merge branch 'release-v0.2.6'

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.2.6](https://github.com/cad/ovpm/tree/v0.2.6) (2017-10-16)
+[Full Changelog](https://github.com/cad/ovpm/compare/v0.2.5...v0.2.6)
+
+**Fixed bugs:**
+
+- ccd emit doesn't work correctly [\#57](https://github.com/cad/ovpm/issues/57)
+
 ## [v0.2.5](https://github.com/cad/ovpm/tree/v0.2.5) (2017-10-13)
 [Full Changelog](https://github.com/cad/ovpm/compare/v0.2.4...v0.2.5)
 
@@ -169,3 +176,4 @@
 - implement remote control proto [\#8](https://github.com/cad/ovpm/issues/8)
 - write docs [\#4](https://github.com/cad/ovpm/issues/4)
 - write unit tests [\#3](https://github.com/cad/ovpm/issues/3)
+

README.md

@@ -101,3 +101,4 @@ another computer.
 
 * [User Management](https://github.com/cad/ovpm/wiki/User-Management)
 * [Network Management](https://github.com/cad/ovpm/wiki/Network-Management)
+* [Web Interface](https://github.com/cad/ovpm/wiki/Web-Interface)

bindata/bindata.go

@@ -93,7 +93,7 @@ func templateAuthSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2503, mode: os.FileMode(420), modTime: time.Unix(1507924142, 0)}
+	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2503, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -113,7 +113,7 @@ func templateBundleJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/bundle.js", size: 298347, mode: os.FileMode(420), modTime: time.Unix(1507924152, 0)}
+	info := bindataFileInfo{name: "template/bundle.js", size: 298347, mode: os.FileMode(420), modTime: time.Unix(1508158530, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -153,7 +153,7 @@ func templateClientOvpnTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 381, mode: os.FileMode(420), modTime: time.Unix(1507923801, 0)}
+	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 381, mode: os.FileMode(420), modTime: time.Unix(1508158156, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -193,7 +193,7 @@ func templateIndexHtml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/index.html", size: 577, mode: os.FileMode(420), modTime: time.Unix(1507924152, 0)}
+	info := bindataFileInfo{name: "template/index.html", size: 577, mode: os.FileMode(420), modTime: time.Unix(1508158530, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -233,7 +233,7 @@ func templateNetworkSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1507924142, 0)}
+	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -253,7 +253,7 @@ func templateServerConfTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/server.conf.tmpl", size: 9616, mode: os.FileMode(420), modTime: time.Unix(1507923801, 0)}
+	info := bindataFileInfo{name: "template/server.conf.tmpl", size: 9616, mode: os.FileMode(420), modTime: time.Unix(1508158156, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -273,7 +273,7 @@ func templateUserSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/user.swagger.json", size: 6556, mode: os.FileMode(420), modTime: time.Unix(1507924142, 0)}
+	info := bindataFileInfo{name: "template/user.swagger.json", size: 6556, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -293,7 +293,7 @@ func templateVpnSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3732, mode: os.FileMode(420), modTime: time.Unix(1507924142, 0)}
+	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3732, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

const.go

@@ -2,7 +2,7 @@ package ovpm
 
 const (
 	// Version defines the version of ovpm.
-	Version = "0.2.5"
+	Version = "0.2.6"
 
 	// DefaultVPNPort is the default OpenVPN port to listen.
 	DefaultVPNPort = "1197"

vpn.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"text/template"
 
@@ -793,7 +794,7 @@ func emitCCD() error {
 			return fmt.Errorf("can not render ccd file %s: %s", user.Username, err)
 		}
 
-		err = emitToFile(_DefaultVPNCCDPath+user.Username, result.String(), 0)
+		err = emitToFile(filepath.Join(_DefaultVPNCCDPath, user.Username), result.String(), 0)
 		if err != nil {
 			return err
 		}