Merge branch 'release/v0.2.10'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [v0.2.10](https://github.com/cad/ovpm/tree/v0.2.10)
+
+- Fix ovpmd not starting error on Ubuntu. [#99](https://github.com/cad/ovpm/issues/99)
+
 ## [v0.2.9](https://github.com/cad/ovpm/tree/v0.2.9)
 
 - CLI options to enable comp-lzo back.

cmd/ovpm/cmd_vpn.go

@@ -51,7 +51,7 @@ var vpnInitCommand = cli.Command{
 		},
 		cli.StringFlag{
 			Name:  "net, n",
-			Usage: fmt.Sprintf("VPN network to give clients IP addresses from, in the CIDR form (default: %s)", ovpm.DefaultVPNNetwork),
+			Usage: "VPN network to give clients IP addresses from, in the CIDR form",
 			Value: ovpm.DefaultVPNNetwork,
 		},
 		cli.StringFlag{

contrib/systemd/ovpmd.service.ubuntu

@@ -0,0 +1,18 @@
+[Unit]
+Description=OpenVPn Manager
+Before=multi-user.target
+Before=shutdown.target
+After=local-fs.target
+After=remote-fs.target
+After=network-online.target
+After=systemd-journald-dev-log.socket
+Wants=network-online.target
+Conflicts=shutdown.target
+
+[Service]
+TimeoutSec=5min
+PIDFile=/var/run/ovpmd.pid
+ExecStart=/sbin/ovpmd
+
+[Install]
+WantedBy=multi-user.target

nfpm.yaml

@@ -17,12 +17,12 @@ overrides:
     files:
       ./bin/ovpm: "/bin/ovpm"
       ./bin/ovpmd: "/sbin/ovpmd"
-      ./contrib/systemd/ovpmd.service: "/usr/lib/systemd/system/ovpmd.service"
+      ./contrib/systemd/ovpmd.service.rhel: "/usr/lib/systemd/system/ovpmd.service"
   deb:
     files:
       ./bin/ovpm: "/bin/ovpm"
       ./bin/ovpmd: "/sbin/ovpmd"
-      ./contrib/systemd/ovpmd.service: "/lib/systemd/system/ovpmd.service"
+      ./contrib/systemd/ovpmd.service.ubuntu: "/lib/systemd/system/ovpmd.service"
 scripts:
   preinstall: ./scripts/preinstall.sh
   postinstall: ./scripts/postinstall.sh