Browse Source

fix(CI): split unit files according to the OS

Since ovpmd executable path differs on Ubuntu from RHEL we splitted the unit files in two.

Closes #99
Mustafa Arici 5 years ago
parent
commit
ed42f8828f
4 changed files with 24 additions and 2 deletions
  1. 4 0
      CHANGELOG.md
  2. 0 0
      contrib/systemd/ovpmd.service.rhel
  3. 18 0
      contrib/systemd/ovpmd.service.ubuntu
  4. 2 2
      nfpm.yaml

+ 4 - 0
CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Unreleased
+
+- 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.

+ 0 - 0
contrib/systemd/ovpmd.service → contrib/systemd/ovpmd.service.rhel


+ 18 - 0
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

+ 2 - 2
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