From 2a3e3821bb0b7af4d8ce379c52be93e7e09db034 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

---
 debian/leap-mx.init |  2 +-
 pkg/leap-mx.init    | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 pkg/leap_mx.init    | 66 -----------------------------------------------------
 3 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 pkg/leap-mx.init
 delete mode 100644 pkg/leap_mx.init

diff --git a/debian/leap-mx.init b/debian/leap-mx.init
index cf8cd42..b2cb6f8 120000
--- a/debian/leap-mx.init
+++ b/debian/leap-mx.init
@@ -1 +1 @@
-../pkg/leap_mx.init
\ No newline at end of file
+../pkg/leap-mx.init
\ No newline at end of file
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
diff --git a/pkg/leap_mx.init b/pkg/leap_mx.init
deleted file mode 100644
index 60dddc4..0000000
--- a/pkg/leap_mx.init
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/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 b4110c421f6e2ec64ac3f8c188518f2eaab37a7b 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.
---
 changes/bug_6937_remove-syslog-option | 2 ++
 pkg/leap-mx.init                      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug_6937_remove-syslog-option

diff --git a/changes/bug_6937_remove-syslog-option b/changes/bug_6937_remove-syslog-option
new file mode 100644
index 0000000..d3a65c3
--- /dev/null
+++ b/changes/bug_6937_remove-syslog-option
@@ -0,0 +1,2 @@
+  o Remove logging to syslog for now. We should only do this in the future,
+    when the platform is ready for it. Closes #6937.
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