[Pkg-privacy-commits] [onioncat] 162/241: manpage updated old init script deleted

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch upstream-master
in repository onioncat.

commit 67be13bf854016f3ba5b6da38512c6f5d4feb98f
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Sat Feb 21 21:34:58 2009 +0000

    manpage updated
    old init script deleted
    
    
    git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@474 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 man/ocat.1           | 37 ++++++++++++++++++------------
 rc.d/debian/onioncat | 64 ----------------------------------------------------
 2 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/man/ocat.1 b/man/ocat.1
index ddf1400..c78bbee 100644
--- a/man/ocat.1
+++ b/man/ocat.1
@@ -60,7 +60,11 @@ logged to that file. $HOME is determined from the user under which OnionCat runs
 (see option -u).
 .TP
 \fB\-b\fP
-Run OnionCat in background.
+Run OnionCat in background. This is default. OnionCat will detach from a running
+shell and close standard IO if no log file is given with option -L.
+.TP
+\fB\-B\fP
+Run OnionCat in foreground.
 .TP
 \fB\-C\fP
 Disable the local controller interface. The controller interfaces listens on
@@ -83,8 +87,10 @@ Display short usage message and shows options.
 \fB\-i\fP
 Convert \fIonion_id\fP to IPv6 address and exit.
 .TP
-\fB\-l\fP \fIport\fP
-Local \fIport\fP number OnionCat listens for incoming connections.
+\fB\-l\fP \fI[ip:]port\fP
+Bind Onioncat to specific \fIip \fP and/or \fIport\fP number for incoming
+connections.  This defaults to 127.0.0.1:8060. This option could be set
+multiple times. IPv6 addresses must be given in square brackets.
 .TP
 \fB\-L\fP \fIlog_file\fP
 Log output to \fIlog_file\fP instead of stderr.
@@ -103,14 +109,14 @@ Create \fIpid file\fP instead of \fB/var/run/ocat.pid\fP.
 Run OnionCat as root and don't change user id (see option \fB\-u\fP).
 .TP
 \fB\-R\fP
-Use this option only if you really know what you do!
-Generate a random local onion_id. With this option it is not necessary to add a
-hidden service to the Tor configuration file \fBtorrc\fP.
-One might use OnionCat services within Tor as usualy but it is NOT possible to
-receive incoming connections. If you plan to also receive connections (e.g.
-because you provide a service or you use software which opens sockets for
-incomming connections like Bitorrent) you MUST configure a hidden service and
-supply its hostname to OnionCat on the command line.
+Use this option only if you really know what you do!  OnionCat generates a
+random local onion_id. With this option it is not necessary to add a hidden
+service to the Tor configuration file \fBtorrc\fP.  One might use OnionCat
+services within Tor as usualy but it is NOT possible to receive incoming
+connections. If you plan to also receive connections (e.g.  because you provide
+a service or you use software which opens sockets for incomming connections
+like Bitorrent) you MUST configure a hidden service and supply its hostname to
+OnionCat on the command line.
 .TP
 \fB\-s\fP \fIport\fP
 Set OnionCat's virtual hidden service port to \fIport\fP.
@@ -127,7 +133,7 @@ changes userid after the TUN device is set up correctly.
 .TP
 \fB\-u\fP \fIusername\fP
 \fIusername\fP under which ocat should run. The uid is changed as soon as possible
-after tun device setup.
+after tun device setup. 
 
 .SS TAP DEVICE
 Usually OnionCat opens a TUN device which is a layer 3 interface. With option
@@ -141,8 +147,9 @@ This man page is still not finished...
 $HOME/.ocat/connect_log
 
 .SH AUTHOR
-Software and man page written by Bernhard R. Fischer.
-Concept by Bernhard R. Fischer and Daniel Haslinger.
+Concepts, software, and man page written by Bernhard R. Fischer.
+Package maintenance by Ferdinand Haselbacher.
+Additional support by Daniel Haslinger.
 
 .SH "SEE ALSO"
 OnionCat project page http://www.cypherpunk.at/onioncat/
@@ -150,7 +157,7 @@ OnionCat project page http://www.cypherpunk.at/onioncat/
 Tor project homepage http://www.torproject.org/
 
 .SH COPYRIGHT
-Copyright 2008 Bernhard R. Fischer, Daniel Haslinger.
+Copyright 2008-2009 Bernhard R. Fischer.
 
 This file is part of OnionCat.
 
diff --git a/rc.d/debian/onioncat b/rc.d/debian/onioncat
deleted file mode 100755
index 004c81e..0000000
--- a/rc.d/debian/onioncat
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/bash
-
-### BEGIN INIT INFO
-# Provides:          onioncat
-# Required-Start:    tor
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts OnionCat anonymous TOR VPN
-# Description:       Starts OnionCat anonymous TOR VPN
-### END INIT INFO
-
-set -e
-
-DAEMON=/usr/local/bin/ocat
-NAME=OnionCat
-DESC="o(nion)cat daemon"
-OCATPID=/var/run/ocat.pid
-DAEMON_USER=debian-tor
-DAEMON_NAME=ocat
-ONIONURL=`cat /var/lib/tor/hidden_service/hostname`
-ARGS="-u $DAEMON_USER -b -L /var/lib/tor/.ocat/ocat_log $ONIONURL"
-
-case "$1" in
-  start)
-
-	echo "Starting $DESC: $NAME..."
-
-	start-stop-daemon --start --quiet \
-		--pidfile $OCATPID \
-		$NICE \
-		--exec $DAEMON -- $ARGS
-	echo "done."
-	;;
-
-  stop)
-	echo -n "Stopping $DESC: "
-	pid=`cat $OCATPID 2>/dev/null` || true
-
-	if test ! -f $OCATPID -o -z "$pid"; then
-		echo "not running (there is no $OCATPID)."
-		exit 0
-	fi
-
-	start-stop-daemon --stop --signal INT --quiet --pidfile $OCATPID --name $DAEMON_NAME --user $DAEMON_USER
-	;;
-
-  restart)
-
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-
-  *)
-	echo "Usage: $0 {start|stop|restart}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git