post/pre scripts: debhelper, drop RH, fix adduser

4 files changed, 10 insertions, 23 deletions

diff --git a/debian/postinst b/debian/postinst
index b7a2eaf4..d88e9ddc 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -9,25 +9,13 @@ case $1 in
     fi
 
     if ! getent passwd "kibana" >/dev/null; then
-      adduser --quiet --system --no-create-home --disabled-password \
-      --ingroup "kibana" --shell /bin/false "kibana"
+      adduser --quiet --system --no-create-home --home /nonexistent \
+      --disabled-password --ingroup "kibana" --shell /bin/false "kibana"
     fi
   ;;
   abort-deconfigure|abort-upgrade|abort-remove)
   ;;
 
-  # Red Hat
-  1|2)
-    if ! getent group "kibana" >/dev/null; then
-      groupadd -r "kibana"
-    fi
-
-    if ! getent passwd "kibana" >/dev/null; then
-      useradd -r -g "kibana" -M -s /sbin/nologin \
-      -c "kibana service user" "kibana"
-    fi
-  ;;
-
   *)
       echo "post install script called with unknown argument \`$1'" >&2
       exit 1
@@ -37,3 +25,5 @@ esac
 chown -R kibana:kibana /usr/share/kibana/optimize
 chown kibana:kibana /var/lib/kibana
 chown kibana:kibana /usr/share/kibana/plugins
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index 0f2af2b5..63d97b85 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -18,15 +18,6 @@ case $1 in
   failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear)
   ;;
 
-  # Red Hat
-  0)
-    REMOVE_USER_AND_GROUP=true
-    REMOVE_DIRS=true
-  ;;
-
-  1)
-  ;;
-
   *)
       echo "post remove script called with unknown argument \`$1'" >&2
       exit 1
@@ -60,3 +51,5 @@ if [ "$REMOVE_DIRS" = "true" ]; then
     rmdir --ignore-fail-on-non-empty "/var/lib/kibana"
   fi
 fi
+
+#DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
index 4f3b6590..c26d4cbb 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -12,3 +12,5 @@ elif [ -x /etc/init.d/kibana ]; then
         /etc/init.d/kibana stop
     fi
 fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
index 07d0f341..ab87fedc 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -14,3 +14,5 @@ elif [ -x /etc/init.d/kibana ]; then
     fi
 fi
 echo " OK"
+
+#DEBHELPER#