From 9526f7a877533969e799bcd3b79abb2f20eef5cb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 29 Sep 2015 16:19:27 +0200
Subject: [pkg] Also install the soledad user and group on package install

- Resolves: https://leap.se/code/issues/7499
---
 debian/soledad-server.postinst | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
index 19a2b888..55dc0d14 100644
--- a/debian/soledad-server.postinst
+++ b/debian/soledad-server.postinst
@@ -2,10 +2,26 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
-id soledad-admin > /dev/null
+# create soledad group
+getent group soledad > /dev/null
 RET=$?
 
 if [ ! $RET -eq 0 ]; then
-	adduser --system soledad-admin --home /srv/leap/ --disabled-password --shell /bin/sh --ingroup nogroup
+    addgroup --system soledad
 fi
 
+# create soledad user
+id soledad > /dev/null 2>&1
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+  adduser --system soledad --no-create-home --home /srv/leap/ --ingroup soledad
+fi
+
+# create soledad-admin user
+id soledad-admin > /dev/null 2>&1
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+  adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad
+fi
-- 
cgit v1.2.3