From e600a7f57c177fa45c598d24248ef937f1d02e4b Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 13 Feb 2017 14:13:14 +0100
Subject: [pkg] add script for deploying from git

- Resolves: #8765
---
 scripts/deploy/deploy_soledad_from_git | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100755 scripts/deploy/deploy_soledad_from_git

(limited to 'scripts/deploy/deploy_soledad_from_git')

diff --git a/scripts/deploy/deploy_soledad_from_git b/scripts/deploy/deploy_soledad_from_git
new file mode 100755
index 00000000..7e4ca29c
--- /dev/null
+++ b/scripts/deploy/deploy_soledad_from_git
@@ -0,0 +1,51 @@
+#!/bin/bash
+######################################################
+# Deploy soledad-server from a given remote and branch
+# valid remotes are: origin shyba drebs kali
+# DO NOT USE IN PRODUCTION OR I'LL SEND NINJAS TO YOUR
+# HOUSE!!!!
+# (c) LEAP, 2017
+######################################################
+
+REMOTE=$1
+BRANCH=$2
+
+if [ "$#" -lt 2 ]; then
+  echo "USAGE: $0 REMOTE BRANCH"
+  exit 1
+fi
+
+SOLEDADPATH="/usr/lib/python2.7/dist-packages/leap/soledad/server"
+REPO="https://0xacab.org/leap/soledad"
+LOCALREPO="$HOME/soledad"
+SYSTEMDINIT="/lib/systemd/system/soledad-server.service"
+
+apt remove --yes soledad-server
+
+if [ ! -d "$LOCALREPO" ]; then
+  echo "soledad repo not found, cloning..."
+  cd $HOME
+  git clone $REPO
+  cd $LOCALREPO
+  git remote add shyba https://0xacab.org/shyba/soledad.git
+  git remote add drebs https://0xacab.org/drebs/soledad.git
+  git remote add kali  https://0xacab.org/kali/soledad.git
+fi
+
+cd $LOCALREPO && git checkout -- . && git fetch $REMOTE && git checkout $REMOTE/$BRANCH
+rm -rf $SOLEDADPATH
+
+# copy over some stuff that we'll need -- stolen from debian package
+cp -r $LOCALREPO/server/src/leap/soledad/server $SOLEDADPATH
+cp $LOCALREPO/server/pkg/soledad-server.service $SYSTEMDINIT
+cp $LOCALREPO/server/pkg/create-user-db /usr/bin/
+cp $LOCALREPO/server/pkg/soledad-sudoers /etc/sudoers.d/
+
+# Let's append the branch info to the version string! So that nobody is lost
+cd $LOCALREPO &&  echo "__version__ = '"`git describe`"~"`git status | head -n 1 | cut -d' ' -f 4`"'" >> $SOLEDADPATH/__init__.py
+
+# restart the daemon
+systemctl --system daemon-reload >/dev/null || true
+deb-systemd-invoke start soledad-server.service >/dev/null || true
+
+tail -n 20 /var/log/syslog
-- 
cgit v1.2.3


From 1c002ae9bc2a5c38f078550d993c229c32586ea8 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 13 Feb 2017 14:44:28 +0100
Subject: [pkg] fail on errors

---
 scripts/deploy/deploy_soledad_from_git | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts/deploy/deploy_soledad_from_git')

diff --git a/scripts/deploy/deploy_soledad_from_git b/scripts/deploy/deploy_soledad_from_git
index 7e4ca29c..0f914199 100755
--- a/scripts/deploy/deploy_soledad_from_git
+++ b/scripts/deploy/deploy_soledad_from_git
@@ -6,6 +6,7 @@
 # HOUSE!!!!
 # (c) LEAP, 2017
 ######################################################
+set -e
 
 REMOTE=$1
 BRANCH=$2
-- 
cgit v1.2.3


From ed85f545a9965eb637c1544b3973e3d68e5a602c Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 14 Feb 2017 23:52:13 +0100
Subject: [pkg] restart service instead of starting it

---
 scripts/deploy/deploy_soledad_from_git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/deploy/deploy_soledad_from_git')

diff --git a/scripts/deploy/deploy_soledad_from_git b/scripts/deploy/deploy_soledad_from_git
index 0f914199..3c4ac8be 100755
--- a/scripts/deploy/deploy_soledad_from_git
+++ b/scripts/deploy/deploy_soledad_from_git
@@ -47,6 +47,6 @@ cd $LOCALREPO &&  echo "__version__ = '"`git describe`"~"`git status | head -n 1
 
 # restart the daemon
 systemctl --system daemon-reload >/dev/null || true
-deb-systemd-invoke start soledad-server.service >/dev/null || true
+deb-systemd-invoke restart soledad-server.service >/dev/null || true
 
 tail -n 20 /var/log/syslog
-- 
cgit v1.2.3