summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2005-02-02 06:20:38 +0000
committerPeter Palfrader <peter@palfrader.org>2005-02-02 06:20:38 +0000
commit0fcc0c66ea0a10b9e220bd975be1de5590760263 (patch)
tree5233a12b98d3fe4d8aed8e711c2abb4b3a8b1b44
parent0bb28be3ed536fadd2abf3157512b8726280310c (diff)
downloadtor-0fcc0c66ea0a10b9e220bd975be1de5590760263.tar.gz
tor-0fcc0c66ea0a10b9e220bd975be1de5590760263.zip
Set ulimit for file descriptors to 4096 in our init script
svn:r3501
-rw-r--r--changelog4
-rw-r--r--tor.default7
-rw-r--r--tor.init2
3 files changed, 12 insertions, 1 deletions
diff --git a/changelog b/changelog
index bebdc8f22f..bf77eb6106 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,10 @@ tor (0.1.0.0-alpha-cvs-1) UNRELEASED; urgency=low
* Forward port 06_add_compile_time_defaults.
* Add libevent-dev to build-depends.
* Update URL to tor in debian/control and debian/copyright.
+ * Set ulimit for file descriptors to 4096 in our init
+ script.
- -- Peter Palfrader <weasel@debian.org> Sun, 23 Jan 2005 16:26:13 +0100
+ -- Peter Palfrader <weasel@debian.org> Wed, 2 Feb 2005 07:19:34 +0100
tor (0.0.9.3-1) unstable; urgency=low
diff --git a/tor.default b/tor.default
index a9a023105a..92491c2b1d 100644
--- a/tor.default
+++ b/tor.default
@@ -8,6 +8,13 @@
RUN_DAEMON="yes"
#
+# Servers sometimes may need more than the default 1024 file descriptors
+# if they are very busy and have many clients connected to them.
+# (ulimit -n)
+#
+MAX_FILEDESCRIPTORS=4096
+
+#
# Uncomment this if you want to get coredumps
#
ulimit -c unlimited
diff --git a/tor.init b/tor.init
index 3763996f9f..93fb375448 100644
--- a/tor.init
+++ b/tor.init
@@ -10,6 +10,7 @@ TORPID=/var/run/tor/tor.pid
DEFAULTSFILE=/etc/default/$NAME
WAITFORDAEMON=10
ARGS=""
+MAX_FILEDESCRIPTORS=4096
test -x $DAEMON || exit 0
@@ -49,6 +50,7 @@ case "$1" in
echo "Not starting $DESC (Disabled in $DEFAULTSFILE)."
else
echo "Starting $DESC: $NAME..."
+ ulimit -n $MAX_FILEDESCRIPTORS
start-stop-daemon --start --quiet --oknodo \
--chuid debian-tor:debian-tor \
--pidfile $TORPID \