From 0a99d63c71b1a714571bd77c10a2a3dfe6caf04e Mon Sep 17 00:00:00 2001
From: Christoph Kluenter <ckluente@thoughtworks.com>
Date: Thu, 24 Sep 2015 20:36:22 +0200
Subject: [pkg] include script to create user-db

See PR 279
---
 debian/soledad-server.postinst | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 debian/soledad-server.postinst

(limited to 'debian/soledad-server.postinst')

diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
new file mode 100644
index 00000000..19a2b888
--- /dev/null
+++ b/debian/soledad-server.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+id soledad-admin > /dev/null
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+	adduser --system soledad-admin --home /srv/leap/ --disabled-password --shell /bin/sh --ingroup nogroup
+fi
+
-- 
cgit v1.2.3


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(-)

(limited to 'debian/soledad-server.postinst')

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


From d74bbe94e2135cb66406005f69406bb4a23a2780 Mon Sep 17 00:00:00 2001
From: Christoph Kluenter <ckluente@thouthworks.com>
Date: Tue, 27 Oct 2015 11:18:26 +0100
Subject: restart soledad server after upgrade

---
 debian/soledad-server.postinst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'debian/soledad-server.postinst')

diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
index 55dc0d14..0f46caf6 100644
--- a/debian/soledad-server.postinst
+++ b/debian/soledad-server.postinst
@@ -25,3 +25,6 @@ RET=$?
 if [ ! $RET -eq 0 ]; then
   adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad
 fi
+
+
+invoke-rc.d soledad-server start
-- 
cgit v1.2.3