From 4194c2ec772302d2833ceed47658f074d8311c2d Mon Sep 17 00:00:00 2001 From: fbt Date: Sat, 9 Nov 2013 22:37:01 +0400 Subject: [PATCH] a bit saner defaults --- init.d/cjdroute | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/init.d/cjdroute b/init.d/cjdroute index 0823d6b..5eee660 100755 --- a/init.d/cjdroute +++ b/init.d/cjdroute @@ -3,13 +3,12 @@ unset reload service_username='cjdns' -service_command='/home/cjdns/cjdns/cjdroute' -service_args='< /home/cjdns/cjdns/cjdroute.conf' -service_logfile='/home/cjdns/cjdns/cjdroute.log' +service_command='/usr/local/sbin/cjdroute' +service_args='< /etc/cjdns/cjdroute.conf' cjdroute_tun_interface='cjd0' cjdroute_ipv6_addr='fca7:8aef:6571:63c5:b23c:2fbc:8dea:e207/8' -cjdroute_listen_port='7530' +cjdroute_listen_port='11270' service_pid=`lsof -i :"$cjdroute_listen_port" | tail -1 | cut -d ' ' -f 2` @@ -24,10 +23,15 @@ cjdroute.destroy_tun() { } start() { - cjdroute.create_tun && watchman.start + [[ "$service_username" ]] && { + cjdroute.create_tun || { return 1; } + } + + watchman.start } stop() { watchman.stop - cjdroute.destroy_tun + + [[ "$service_username" ]] && { cjdroute.destroy_tun; } }