diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-02-20 22:39:06 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-02-20 22:39:06 +0000 |
| commit | ba977ed4f1e3e48759fa48bed9bb4de5085e32d6 (patch) | |
| tree | ff61871ea5cc6ac323b64b12d6169d21dbeb7756 /debian | |
| parent | c92c5733d6384f20bcf96049a56d7b86f8f7e7a9 (diff) | |
| download | tor-ba977ed4f1e3e48759fa48bed9bb4de5085e32d6.tar.gz tor-ba977ed4f1e3e48759fa48bed9bb4de5085e32d6.zip | |
I wonder what color it will be
svn:r13628
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/tor.init | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 657e5c9147..be92ffb3bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ tor (0.2.0.19-alpha+svn-1) unreleased; urgency=low * Change the default for MAX_FILEDESCRIPTORS in our init script to depend on the number of system-wide available file descriptors: /proc/sys/fs/file-max is bigger than 80k, set ulimit -n to 32k, if it's - greater than 40k set the limit to 16k, and when greater than 20k our limit + greater than 40k set the limit to 16k, and when greater than 10k our limit shall be 8k descriptors. If there are less than 20k FDs in the entire system default to a limit of only 1024. @@ -11,7 +11,7 @@ tor (0.2.0.19-alpha+svn-1) unreleased; urgency=low default of 8k no longer is sufficient. On the other hand we don't want lower end systems to run out of FDs on Tor's account. - -- Peter Palfrader <weasel@debian.org> Wed, 20 Feb 2008 23:33:00 +0100 + -- Peter Palfrader <weasel@debian.org> Wed, 20 Feb 2008 23:38:45 +0100 tor (0.2.0.19-alpha-1) experimental; urgency=low diff --git a/debian/tor.init b/debian/tor.init index afb7f7eecc..d026240aaf 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -32,7 +32,7 @@ if [ -r /proc/sys/fs/file-max ]; then MAX_FILEDESCRIPTORS=32768 elif [ "$system_max" -gt "40000" ] ; then MAX_FILEDESCRIPTORS=16384 - elif [ "$system_max" -gt "20000" ] ; then + elif [ "$system_max" -gt "10000" ] ; then MAX_FILEDESCRIPTORS=8192 else MAX_FILEDESCRIPTORS=1024 |