commit 3f59ae7a5c65a9de314fee86969bda5b4dc60924 Author: David Fifield david@bamsoftware.com Date: Fri Sep 20 22:20:13 2013 -0700

Install and use default relays file. --- facilitator/Makefile | 2 ++ facilitator/init.d/facilitator | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/facilitator/Makefile b/facilitator/Makefile index 90855d2..e69f9a7 100644 --- a/facilitator/Makefile +++ b/facilitator/Makefile @@ -7,6 +7,8 @@ all: install: mkdir -p $(BINDIR) cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py $(BINDIR) + mkdir -p /etc/flashproxy + cp -f relays /etc/flashproxy cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon /etc/init.d/

clean: diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index 19bb482..4962383 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -14,18 +14,16 @@

# Based on /etc/init.d/skeleton from Debian 6.

-# The relay must support the websocket pluggable transport. -# This is the IPv4 address of tor1.bamsoftware.com. -RELAY=173.255.221.44:9901 - PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin DESC="Flash proxy facilitator" NAME=facilitator PIDFILE=/var/run/$NAME.pid LOGFILE=/var/log/$NAME.log +CONFDIR=/etc/flashproxy +RELAYFILE=$CONFDIR/relays PRIVDROP_USER=facilitator-nobody DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" +DAEMON_ARGS="--relay-file $CONFDIR/relays --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" SCRIPTNAME=/etc/init.d/$NAME

# Exit if the package is not installed