Merge branch 'dev'

Author: cuprumtan

packaging/debian/postinst

@@ -12,22 +12,19 @@ if [ "$1" = "configure" ]; then
             --home /var/run/mamonsu/ --no-create-home \
             mamonsu
     fi
-
-    mkdir -p /var/run/mamonsu
+	if [ -x /bin/systemd-tmpfiles ]; then
+		systemd-tmpfiles --create > /dev/null 2>&1 || :
+	else
+		mkdir -p /var/run/mamonsu
+		chown -R mamonsu:mamonsu /var/run/mamonsu
+	fi
 
     mkdir -p /etc/mamonsu/plugins
     touch /etc/mamonsu/plugins/__init__.py
     [ -f /etc/mamonsu/agent.conf ] || cp /usr/share/mamonsu/example_linux.conf /etc/mamonsu/agent.conf
-
-    chown -R mamonsu:mamonsu /var/run/mamonsu
-    chown -R mamonsu:mamonsu /var/log/mamonsu
-    chown -R mamonsu:mamonsu /var/lib/mamonsu
+	mkdir -p /var/log/mamonsu
+	mkdir -p /var/lib/mamonsu
+    chown mamonsu:mamonsu /var/log/mamonsu
+    chown mamonsu:mamonsu /var/lib/mamonsu
     chown -R mamonsu:mamonsu /etc/mamonsu
-
 fi
-
-if [ -x "/etc/init.d/mamonsu" ]; then
-    update-rc.d mamonsu defaults >/dev/null
-fi
-
-exit 0

packaging/debian/postrm

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|remove)
+	:
+	;;
+    purge)
+        rm -rf /etc/mamonsu
+	;;
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+esac

packaging/debian/prerm

@@ -4,24 +4,22 @@ set -e
 
 case "$1" in
     failed-upgrade|abort-install|abort-upgrade|disappear|upgrade)
-    ;;
+	:
+	;;
     remove)
-        [ -x /etc/init.d/mamonsu ] && /etc/init.d/mamonsu stop || true
-    ;;
+	[ -x /etc/init.d/mamonsu ] && /etc/init.d/mamonsu stop 1>/dev/null 2>/dev/null || true
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig mamonsu off 1>/dev/null 2>/dev/null || true
+	;;
     purge)
-        [ -x /etc/init.d/mamonsu ] && /etc/init.d/mamonsu stop || true
+	[ -x /etc/init.d/mamonsu ] && /etc/init.d/mamonsu stop 1>/dev/null 2>/dev/null || true
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig mamonsu off 1>/dev/null 2>/dev/null || true
         rm -fr /var/log/mamonsu
         rm -fr /var/run/mamonsu
         rm -fr /var/lib/mamonsu
-        rm -rf /etc/mamonsu
-    ;;
-
+        rm -f /etc/mamonsu/agent.conf
+        rm -rf /etc/mamonsu/plugins
+	;;
     *)
-        echo "postrm called with unknown argument \`$1'" >&2
+        echo "prerm called with unknown argument \`$1'" >&2
         exit 1
 esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#

packaging/debian/rules

@@ -34,7 +34,7 @@ binary-indep: build install
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
-	install -m 0600 packaging/conf/example_linux.conf debian/mamonsu/usr/share/mamonsu
+	install -m 0600 packaging/conf/example_linux.conf debian/mamonsu/usr/share/mamonsu/example_linux.conf
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i