Merge pull request #77 from ovh/debian

chore: update debian package

debian/beamium.init

@@ -17,7 +17,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="beamium"
 NAME=beamium
-DAEMON=/usr/sbin/$NAME
+DAEMON=/usr/bin/$NAME
 PID_FILE=/var/run/$NAME.pid
 USER="beamium"
 GROUP="beamium"

debian/beamium.install

@@ -1,2 +1,2 @@
-debug/beamium usr/sbin
+release/beamium usr/bin
 etc/beamium/config.yaml

debian/beamium.postinst

@@ -43,10 +43,14 @@ case "$1" in
     configure)
         chown -R beamium:beamium /var/log/beamium
         chown -R beamium:beamium /opt/beamium
+        # fix rights on logrotate
+        if [ -f "/etc/logrotate.d/$SERVICE" ]; then
+            chown root:root /etc/logrotate.d/$SERVICE
+        fi
         registerService
         STATUS=$(statusService) || true
         if [ "$STATUS" = "$SERVICE is running." ] ; then
-            echo  "$SERVICE is running: not restarting it."
+            echo "$SERVICE is running: not restarting it."
         else
             startService
         fi

debian/beamium.preinst

@@ -2,6 +2,9 @@
 
 set -e
 
+SERVICE=beamium
+PID_FILE=/var/run/$SERVICE.pid
+
 case "$1" in
     install)
         # create a beamium group and user
@@ -11,6 +14,18 @@ case "$1" in
     ;;
 
     upgrade)
+        # remove old sysV if present
+        if systemctl status >/dev/null 2>&1; then
+            if [ -x "/etc/init.d/$SERVICE" ]; then
+                update-rc.d $SERVICE remove || true
+            fi
+            # stop old process
+            if [ -f "$PID_FILE" ]; then
+                pkill -9 --pidfile "$PID_FILE"
+                rm -f $PID_FILE
+                deb-systemd-invoke stop $SERVICE.service
+            fi
+        fi
     ;;
 
     *)

debian/beamium.service

@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/default/beamium
-ExecStart=/usr/sbin/beamium --config=/etc/beamium/config.yaml
+ExecStart=/usr/bin/beamium --config=/etc/beamium/config.yaml
 Restart=on-failure
 User=beamium
 Group=beamium

debian/control

@@ -1,10 +1,10 @@
 Source: beamium
 Section: default
 Priority: extra
-Maintainer: Aurélien Nephtali <aurelien.nephtali@corp.ovh.com>
-Build-Depends: debhelper (>= 8.0.0), git, pkg-config, libssl-dev, lsb-release
+Maintainer: Kevin GEORGES <kevin.georges@corp.ovh.com>
+Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5), git, pkg-config, libssl-dev, lsb-release
 Standards-Version: 3.9.6
-Homepage: https://github.com/runabove/beamium
+Homepage: https://github.com/ovh/beamium
 
 Package: beamium
 Architecture: i386 amd64

debian/rules

@@ -5,6 +5,9 @@
 #export DH_VERBOSE=1
 
 BUILD_DIR=$(CURDIR)/debian/tmp
+DISTRIBUTION = $(shell lsb_release -cs)
+VERSION = $(shell cat Cargo.toml | grep version | head -1 | awk -F "\"" '{print $$2}')
+PACKAGEVERSION = $(VERSION)-$(DISTRIBUTION)
 export CARGO_TARGET_DIR=$(BUILD_DIR)
 
 DEBIAN_VERSION = $(shell lsb_release -rs | cut -d . -f 1)
@@ -21,7 +24,7 @@ endif
 	dh $@ ${DH_ARGS}
 
 override_dh_auto_build:
-	cargo build
+	cargo build --release
 
 override_dh_install:
 	mkdir -p $(BUILD_DIR)/etc/beamium
@@ -30,3 +33,6 @@ override_dh_install:
 
 override_dh_prep:
 	dh_prep -Xdebian/tmp
+
+override_dh_gencontrol:
+	dh_gencontrol -- -v$(PACKAGEVERSION)