mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 20:23:03 +02:00
9230bc7c65
We've accumulated a lot of cruft in this directory over the years: so much, that it passed the point of being so disorganized that we no longer browsed through it to see how bad it had gotten. This patch (based on changes by rl1987) tries to remove the most useless items, and split the others into reasonable directories. It creates a new scripts/ directory for maint and test scripts. This patch was generated with the script below. No other changes are made in this patch. ############# # new directories mkdir -p contrib/test-tools mkdir -p contrib/or-tools mkdir -p contrib/dirauth-tools mkdir -p contrib/operator-tools mkdir -p contrib/client-tools mkdir -p contrib/test-tools mkdir -p contrib/dist mkdir -p contrib/dist/suse mkdir -p contrib/win32build mkdir -p scripts/maint mkdir -p scripts/test ############ # Deleted -- nobody who wants this is going to be looking for it here any # longer. Also, nobody wants it. git rm contrib/auto-naming/README # Deleted: We no longer do polipo. git rm contrib/polipo/Makefile.mingw git rm contrib/polipo/README git rm contrib/polipo/polipo-mingw.nsi # We haven't even tried to run this for ages. It is a relic of a bygone era git rm contrib/mdd.py # contrib/dir-tools/directory-archive/ # Tools for running a directory archive. No longer used - deleting them. git rm contrib/directory-archive/crontab.sample git rm contrib/directory-archive/fetch-all git rm contrib/directory-archive/fetch-all-v3 git rm contrib/directory-archive/tar-them-up git rm contrib/directory-archive/fetch-all-functions git rm contrib/directory-archive/sort-into-month-folder # This appears to be related to very old windows packaging stuff. git rm contrib/bundle.nsi git rm contrib/package_nsis-weasel.sh git rm contrib/package_nsis.sh git rm contrib/netinst.nsi git rm contrib/torinst32.ico git rm contrib/xenobite.ico # This should not be needed for cross-compilation any more, should it? git rm contrib/cross.sh # I don't think anyone ever used this. git rm contrib/make-signature.sh # These are attempts to send tor controller commands from the command-line. # They don't support modern authentication. git rm contrib/tor-ctrl.sh # this is for fetching about a tor server from a dirauth. But it # doesn't authenticate the dirauth: yuck. git rm contrib/sd # wow, such unused, very perl4. git rm contrib/tor-stress ####### contrib/dirauth-tools/ # Tools for running a directory authority git mv contrib/add-tor contrib/dirauth-tools/ git mv contrib/nagios-check-tor-authority-cert contrib/dirauth-tools/ ####### # contrib/or-tools/ # Tools for examining relays git mv contrib/check-tor contrib/or-tools/check-tor git mv contrib/checksocks.pl contrib/or-tools/checksocks.pl git mv contrib/exitlist contrib/or-tools/exitlist ####### # contrib/operator-tools # Tools for running a relay. git mv contrib/linux-tor-prio.sh contrib/operator-tools/linux-tor-prio.sh git mv contrib/tor-exit-notice.html contrib/operator-tools/tor-exit-notice.html git mv contrib/tor.logrotate.in contrib/operator-tools/ ###### # contrib/dist git mv contrib/rc.subr contrib/dist/ git mv contrib/tor.sh.in contrib/dist/ git mv contrib/torctl.in contrib/dist/ git mv contrib/suse/* contrib/dist/suse/ ###### # client-tools git mv contrib/torify contrib/client-tools/torify git mv contrib/tor-resolve.py contrib/client-tools/ ###### # win32build git mv contrib/package_nsis-mingw.sh contrib/win32build/ git mv contrib/tor.nsi.in contrib/win32build/ # Erinn didn't ask for this... git mv contrib/tor-mingw.nsi.in contrib/win32build/ git mv contrib/tor.ico contrib/win32build/ ###### # scripts/test git mv contrib/cov-blame scripts/test/cov-blame git mv contrib/cov-diff scripts/test/cov-diff git mv contrib/coverage scripts/test/coverage git mv contrib/scan-build.sh scripts/test/ ######## scripts/maint # Maintainance scripts # # These are scripts for developers to use when hacking on Tor. They mostly # look at the Tor source in one way or another. git mv contrib/findMergedChanges.pl scripts/maint/findMergedChanges.pl git mv contrib/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl git mv contrib/checkSpace.pl scripts/maint/checkSpace.pl git mv contrib/redox.py scripts/maint/redox.py git mv contrib/updateVersions.pl scripts/maint/updateVersions.pl git mv contrib/checkLogs.pl scripts/maint/checkLogs.pl git mv contrib/format_changelog.py scripts/maint/
124 lines
2.8 KiB
Bash
124 lines
2.8 KiB
Bash
#!/bin/sh
|
|
#
|
|
# tor The Onion Router
|
|
#
|
|
# Startup/shutdown script for tor. This is a wrapper around torctl;
|
|
# torctl does the actual work in a relatively system-independent, or at least
|
|
# distribution-independent, way, and this script deals with fitting the
|
|
# whole thing into the conventions of the particular system at hand.
|
|
# This particular script is written for Red Hat/Fedora Linux, and may
|
|
# also work on Mandrake, but not SuSE.
|
|
#
|
|
# These next couple of lines "declare" tor for the "chkconfig" program,
|
|
# originally from SGI, used on Red Hat/Fedora and probably elsewhere.
|
|
#
|
|
# chkconfig: 2345 90 10
|
|
# description: Onion Router - A low-latency anonymous proxy
|
|
#
|
|
|
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
|
DAEMON=/usr/sbin/tor
|
|
NAME=tor
|
|
DESC="tor daemon"
|
|
TORPIDDIR=/var/run/tor
|
|
TORPID=$TORPIDDIR/tor.pid
|
|
WAITFORDAEMON=60
|
|
ARGS=""
|
|
|
|
# Library functions
|
|
if [ -f /etc/rc.d/init.d/functions ]; then
|
|
. /etc/rc.d/init.d/functions
|
|
elif [ -f /etc/init.d/functions ]; then
|
|
. /etc/init.d/functions
|
|
fi
|
|
|
|
TORCTL=@BINDIR@/torctl
|
|
|
|
# torctl will use these environment variables
|
|
TORUSER=@TORUSER@
|
|
export TORUSER
|
|
|
|
if [ -x /bin/su ] ; then
|
|
SUPROG=/bin/su
|
|
elif [ -x /sbin/su ] ; then
|
|
SUPROG=/sbin/su
|
|
elif [ -x /usr/bin/su ] ; then
|
|
SUPROG=/usr/bin/su
|
|
elif [ -x /usr/sbin/su ] ; then
|
|
SUPROG=/usr/sbin/su
|
|
else
|
|
SUPROG=/bin/su
|
|
fi
|
|
|
|
# Raise ulimit based on number of file descriptors available (thanks, Debian)
|
|
|
|
if [ -r /proc/sys/fs/file-max ]; then
|
|
system_max=`cat /proc/sys/fs/file-max`
|
|
if [ "$system_max" -gt "80000" ] ; then
|
|
MAX_FILEDESCRIPTORS=32768
|
|
elif [ "$system_max" -gt "40000" ] ; then
|
|
MAX_FILEDESCRIPTORS=16384
|
|
elif [ "$system_max" -gt "10000" ] ; then
|
|
MAX_FILEDESCRIPTORS=8192
|
|
else
|
|
MAX_FILEDESCRIPTORS=1024
|
|
cat << EOF
|
|
|
|
Warning: Your system has very few filedescriptors available in total.
|
|
|
|
Maybe you should try raising that by adding 'fs.file-max=100000' to your
|
|
/etc/sysctl.conf file. Feel free to pick any number that you deem appropriate.
|
|
Then run 'sysctl -p'. See /proc/sys/fs/file-max for the current value, and
|
|
file-nr in the same directory for how many of those are used at the moment.
|
|
|
|
EOF
|
|
fi
|
|
else
|
|
MAX_FILEDESCRIPTORS=8192
|
|
fi
|
|
|
|
NICE=""
|
|
|
|
case "$1" in
|
|
|
|
start)
|
|
if [ -n "$MAX_FILEDESCRIPTORS" ]; then
|
|
echo -n "Raising maximum number of filedescriptors (ulimit -n) to $MAX_FILEDESCRIPTORS"
|
|
if ulimit -n "$MAX_FILEDESCRIPTORS" ; then
|
|
echo "."
|
|
else
|
|
echo ": FAILED."
|
|
fi
|
|
fi
|
|
|
|
action $"Starting tor:" $TORCTL start
|
|
RETVAL=$?
|
|
;;
|
|
|
|
stop)
|
|
action $"Stopping tor:" $TORCTL stop
|
|
RETVAL=$?
|
|
;;
|
|
|
|
restart)
|
|
action $"Restarting tor:" $TORCTL restart
|
|
RETVAL=$?
|
|
;;
|
|
|
|
reload)
|
|
action $"Reloading tor:" $TORCTL reload
|
|
RETVAL=$?
|
|
;;
|
|
|
|
status)
|
|
$TORCTL status
|
|
RETVAL=$?
|
|
;;
|
|
|
|
*)
|
|
echo "Usage: $0 (start|stop|restart|reload|status)"
|
|
RETVAL=1
|
|
esac
|
|
|
|
exit $RETVAL
|