From 7eb87d94b3bd48242e5a456c0051c810e6db8095 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 5 May 2015 12:08:05 -0300
Subject: [refactor] move initscript to more sensible name

---
 pkg/leap-mx.init | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pkg/leap-mx.init

(limited to 'pkg/leap-mx.init')

diff --git a/pkg/leap-mx.init b/pkg/leap-mx.init
new file mode 100644
index 0000000..60dddc4
--- /dev/null
+++ b/pkg/leap-mx.init
@@ -0,0 +1,66 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          leap-mx
+# Required-Start:    $network $named $remote_fs $syslog $time
+# Required-Stop:     $network $named $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start leap-mx daemon at boot time
+# Description:       transparently-encrypting remailer
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PIDFILE=/var/run/leap_mx.pid
+RUNDIR=/var/lib/leap_mx/
+FILE=/usr/share/app/leap_mx.tac
+LOGFILE=/var/log/leap_mx.log
+TWISTD_PATH=/usr/bin/twistd
+
+[ -r /etc/default/leap_mx ] && . /etc/default/leap_mx
+
+. /lib/lsb/init-functions
+
+test -r $file || exit 0
+test -r /etc/leap/ || exit 0
+
+
+case "$1" in
+    start)
+        echo -n "Starting leap_mx: twistd"
+        HOME="/var/lib/leap_mx/" \
+          start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
+                          --pidfile=$PIDFILE \
+                          --rundir=$RUNDIR \
+                          --python=$FILE \
+                          --logfile=$LOGFILE \
+                          --syslog --prefix=leap-mx
+        echo "."
+    ;;
+
+    stop)
+        echo -n "Stopping leap_mx: twistd"
+        start-stop-daemon --stop --quiet  \
+            --pidfile $PIDFILE
+        echo "."
+    ;;
+
+    restart)
+        $0 stop
+        $0 start
+    ;;
+
+    force-reload)
+        $0 restart
+    ;;
+
+    status)
+        status_of_proc -p $PIDFILE $TWISTD_PATH leap_mx && exit 0 || exit $?
+    ;;
+
+    *)
+        echo "Usage: /etc/init.d/leap_mx {start|stop|restart|force-reload|status}" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
-- 
cgit v1.2.3


From f3261e937390fa703392d1234d47c00647285d42 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 8 May 2015 16:38:54 -0300
Subject: [bug] remove --syslog twistd option

Currently, we don't want to log to syslog, because the platform has to be
modified before we can do that (see #6942). In the future, we might want to
log to syslog only, or make it optional depending on the contents of
/etc/default/leap_mx. For now we just remove twistd's --syslog option from the
initscript.

Closes: #6937.
---
 pkg/leap-mx.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg/leap-mx.init')

diff --git a/pkg/leap-mx.init b/pkg/leap-mx.init
index 60dddc4..d38cc2c 100644
--- a/pkg/leap-mx.init
+++ b/pkg/leap-mx.init
@@ -33,7 +33,7 @@ case "$1" in
                           --rundir=$RUNDIR \
                           --python=$FILE \
                           --logfile=$LOGFILE \
-                          --syslog --prefix=leap-mx
+                          --prefix=leap-mx
         echo "."
     ;;
 
-- 
cgit v1.2.3


From ebc748d6dbe366d82e601c94f4191718b310bfae Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Wed, 18 Nov 2015 19:50:02 +0100
Subject: [feat] Use syslog for logging

- Closes: #6859
- Related: #6942
---
 pkg/leap-mx.init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkg/leap-mx.init')

diff --git a/pkg/leap-mx.init b/pkg/leap-mx.init
index d38cc2c..0c66bc5 100644
--- a/pkg/leap-mx.init
+++ b/pkg/leap-mx.init
@@ -13,7 +13,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 PIDFILE=/var/run/leap_mx.pid
 RUNDIR=/var/lib/leap_mx/
 FILE=/usr/share/app/leap_mx.tac
-LOGFILE=/var/log/leap_mx.log
 TWISTD_PATH=/usr/bin/twistd
 
 [ -r /etc/default/leap_mx ] && . /etc/default/leap_mx
@@ -32,7 +31,7 @@ case "$1" in
                           --pidfile=$PIDFILE \
                           --rundir=$RUNDIR \
                           --python=$FILE \
-                          --logfile=$LOGFILE \
+                          --syslog \
                           --prefix=leap-mx
         echo "."
     ;;
-- 
cgit v1.2.3


From 7723faea45549999f1a64b6113289c2d7fbe8695 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 24 Nov 2015 15:46:40 -0500
Subject: Change initscript to run leap-mx as an unpriviledged user (#7634)

---
 pkg/leap-mx.init | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pkg/leap-mx.init')

diff --git a/pkg/leap-mx.init b/pkg/leap-mx.init
index 0c66bc5..3878bce 100644
--- a/pkg/leap-mx.init
+++ b/pkg/leap-mx.init
@@ -14,6 +14,8 @@ PIDFILE=/var/run/leap_mx.pid
 RUNDIR=/var/lib/leap_mx/
 FILE=/usr/share/app/leap_mx.tac
 TWISTD_PATH=/usr/bin/twistd
+USER=leap-mx
+GROUP=leap-mx
 
 [ -r /etc/default/leap_mx ] && . /etc/default/leap_mx
 
@@ -32,7 +34,9 @@ case "$1" in
                           --rundir=$RUNDIR \
                           --python=$FILE \
                           --syslog \
-                          --prefix=leap-mx
+                          --prefix=leap-mx \
+                          --uid=$USER \
+                          --gid=$GROUP
         echo "."
     ;;
 
-- 
cgit v1.2.3