summaryrefslogtreecommitdiff
path: root/puppet/modules/obfsproxy/files
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/obfsproxy/files')
-rwxr-xr-xpuppet/modules/obfsproxy/files/obfsproxy_daemon7
1 files changed, 4 insertions, 3 deletions
diff --git a/puppet/modules/obfsproxy/files/obfsproxy_daemon b/puppet/modules/obfsproxy/files/obfsproxy_daemon
index f5914980..4c9bcedc 100755
--- a/puppet/modules/obfsproxy/files/obfsproxy_daemon
+++ b/puppet/modules/obfsproxy/files/obfsproxy_daemon
@@ -16,8 +16,9 @@ DAEMON=/usr/bin/obfsproxy
NAME=obfsproxy
DESC="obfsproxy daemon"
USER=obfsproxy
+DATDIR=/etc/obfsproxy
PIDFILE=/var/run/obfsproxy.pid
-CONF=/etc/obfsproxy.conf
+CONF=$DATDIR/obfsproxy.conf
# If the daemon is not there, then exit.
test -x $DAEMON || exit 0
@@ -29,8 +30,8 @@ else
exit
fi
-DAEMONARGS=" --log-min-severity=$LOG $TRANSPORT $PARAM \
- --dest=$DEST_IP:$DEST_PORT server 0.0.0.0:$PORT"
+DAEMONARGS=" --log-min-severity=$LOG --data-dir=$DATDIR $TRANSPORT \
+ $PARAM --dest=$DEST_IP:$DEST_PORT server 0.0.0.0:$PORT"
start_obfsproxy() {
start-stop-daemon --start --quiet --oknodo -m --pidfile $PIDFILE \