From ad0e1bb375b4676d0be8325cc66e0015e2b254fa Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 29 Jul 2013 20:51:58 -0400
Subject: update to 0.2.3

---
 debian/changelog           |  6 ++++++
 debian/soledad-server.init | 14 +++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 1c65495c..b13f6c2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soledad (0.2.3) unstable; urgency=low
+
+  * Upgrade to new release
+
+ -- Micah Anderson <micah@debian.org>  Mon, 29 Jul 2013 20:47:19 -0400
+
 soledad (0.2.2.1) unstable; urgency=low
 
   * Fix installation of initscript
diff --git a/debian/soledad-server.init b/debian/soledad-server.init
index b1d898cc..d8df7c5d 100644
--- a/debian/soledad-server.init
+++ b/debian/soledad-server.init
@@ -15,7 +15,6 @@ RUNDIR=/var/lib/soledad/
 OBJ=leap.soledad_server.application
 LOGFILE=/var/log/soledad.log
 HTTPS_PORT=2424
-PLAIN_PORT=65534
 CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.pem
 TWISTD_PATH=/usr/bin/twistd
@@ -32,14 +31,11 @@ case "$1" in
     start)
         echo -n "Starting soledad: twistd"
           start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
-                          --pidfile=$PIDFILE \
-                          --logfile=$LOGFILE \
-                          web \
-                          --wsgi=$OBJ \
-                          --https=$HTTPS_PORT \
-                          --certificate=$CERT_PATH \
-                          --privkey=$PRIVKEY_PATH \
-                          --port=$PLAIN_PORT
+            --pidfile=$PIDFILE \
+            --logfile=$LOGFILE \
+            web \
+            --wsgi=$OBJ \
+            --port=ssl:$HTTPS_PORT:privateKey=$PRIVKEY_PATH:certKey=$CERT_PATH
         echo "."
     ;;
 
-- 
cgit v1.2.3