From aa60792075355dc245209baed20aefb9d9b66819 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 13 Aug 2013 14:42:30 -0400
Subject: update to 0.3.0

---
 soledad_server/pkg/soledad | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'soledad_server/pkg/soledad')

diff --git a/soledad_server/pkg/soledad b/soledad_server/pkg/soledad
index 1254cabe..c233731e 100644
--- a/soledad_server/pkg/soledad
+++ b/soledad_server/pkg/soledad
@@ -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.key
 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