diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-06 09:47:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-06 09:47:03 -0300 |
| commit | 573e76b1173f2f268bb0c9c62b1253a71f5f9987 (patch) | |
| tree | 231798c2428b87bf696910cd3585d3ca16db59a7 | |
| parent | ccb79e033014eb86cfe3cfcfef9fe8ef857836ab (diff) | |
| parent | c76373323277a7703c9e7839a1b118519d95a8a9 (diff) | |
Merge remote-tracking branch 'drebs/bug/3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript' into develop
| -rw-r--r-- | soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript | 2 | ||||
| -rw-r--r-- | soledad_server/pkg/soledad | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript b/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript new file mode 100644 index 00000000..51ad5a2c --- /dev/null +++ b/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript @@ -0,0 +1,2 @@ + o A plaintext port is not opened by soledad server initscript call to twistd + web anymore. Closes #3254. 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 "." ;; |