From c76373323277a7703c9e7839a1b118519d95a8a9 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 25 Jul 2013 16:39:20 -0300
Subject: Make soledad server only open SSL port.

* Closes #3254
---
 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