Fixed 10_mod_cband.conf, see bug #125441.

Package-Manager: portage-2.1_pre6-r3

diff --git a/www-apache/mod_cband/ChangeLog b/www-apache/mod_cband/ChangeLog
index 8136f966052ca03cf6672de7a1c13ddb070dc1fc..02ea36e796e70f2e0ea61f5420deee29c227c4bb 100644 (file)
--- a/www-apache/mod_cband/ChangeLog
+++ b/www-apache/mod_cband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_cband
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/ChangeLog,v 1.2 2006/03/08 06:32:58 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/ChangeLog,v 1.3 2006/03/16 17:51:54 nelchael Exp $
+
+  16 Mar 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/10_mod_cband.conf:
+  Fixed 10_mod_cband.conf, see bug #125441.
 
   08 Mar 2006; Michael Stewart <vericgar@gentoo.org>
   mod_cband-0.9.7.2.ebuild:

diff --git a/www-apache/mod_cband/Manifest b/www-apache/mod_cband/Manifest
index 9d9095cf23f40c42b210c923c7cc6afbe7e2c7fd..786aec94755c874f93302d54f6182c5bd5d02e6b 100644 (file)
--- a/www-apache/mod_cband/Manifest
+++ b/www-apache/mod_cband/Manifest
@@ -1,9 +1,9 @@
-MD5 0737a6de5960965bdaa7be92cc78fc8f ChangeLog 548
-RMD160 39ff44f2f41c6a6395370bca5b00883185275fba ChangeLog 548
-SHA256 1d5f20272db5986763b552c437d168e0469b380b4d30b032e5b83afe69e7e7d1 ChangeLog 548
-MD5 51273af02bc15d70c8175fd6f11b9959 files/10_mod_cband.conf 75
-RMD160 c37c6461577b812051f8181e6aefe85212cccee5 files/10_mod_cband.conf 75
-SHA256 791c7ed1e9d0e09a7e821d99710016474586b5b892e87056de7380635e3d8c10 files/10_mod_cband.conf 75
+MD5 bf89c14d2c275dbbfefeea58f70b8bff ChangeLog 673
+RMD160 8cac4a93a0f8b819e84b26c5ffe806adab1ed2d5 ChangeLog 673
+SHA256 9205eb367bbf566e58a3f6095c890b89911ef38bf5222d7921db3514efbf750d ChangeLog 673
+MD5 4e4f0046d3e9c2bd659cbb8815763d0f files/10_mod_cband.conf 1126
+RMD160 53f217dddc59e8b683248f460ba1e56024fb767e files/10_mod_cband.conf 1126
+SHA256 9c086d783aaa224d53415deb8108a2ec9a8ca44585fd71c61823231d4f7b58bc files/10_mod_cband.conf 1126
 MD5 807e72b7178a4df15aba92adbc7107e5 files/digest-mod_cband-0.9.7.2 241
 RMD160 fa17a757780737b6730b7423cbb65c8fb835002c files/digest-mod_cband-0.9.7.2 241
 SHA256 ebc1bba1d2f324ed9a524a75d3257cb85ca43a51a545c4f7c3da8967fb9b20f0 files/digest-mod_cband-0.9.7.2 241

diff --git a/www-apache/mod_cband/files/10_mod_cband.conf b/www-apache/mod_cband/files/10_mod_cband.conf
index 15290addf7bdbc10d8425d4194f5aefe8289723a..68b2ed5c626f3a630a0affc07620818ddf63705b 100644 (file)
--- a/www-apache/mod_cband/files/10_mod_cband.conf
+++ b/www-apache/mod_cband/files/10_mod_cband.conf
@@ -1,3 +1,42 @@
+# This file only loads mod_cband and enables /cband-status page.
+# For examples please consult the vhosts.conf.example.gz,
+# vhosts2.conf.example.gz and vhosts3.conf.example.gz files installed in
+# /usr/share/doc/mod_cband-*/
+
 <IfDefine CBAND>
-       LoadModule cband_module modules/mod_cband.so
+       <IfModule !mod_cband.c>
+               LoadModule cband_module modules/mod_cband.so
+       </IfModule>
 </IfDefine>
+
+<IfModule mod_cband.c>
+
+       <Location /cband-status>
+               SetHandler cband-status
+       </Location>
+
+       ## Some defaults:
+       #
+       # CBandDefaultExceededURL http://www.google.com
+       # CBandScoreFlushPeriod 100
+       #
+       ## And in virtual host configuration to limit it's speed:
+       #
+       # <VirtualHost *:80>
+       #       DocumentRoot /var/www/example.com/htdocs
+       #       ServerName www.example.com
+       #       <IfModule mod_cband.c>
+       #               CBandLimit 600M
+       #               CBandExceededURL http://www.example.com/ex1.html
+       #               CBandScoreboard /var/run/mod_cband.example.com.scoreboard
+       #               CBandPeriod 200S
+       #
+       #               # 100kb/s, 10 request/s, max 5 connections
+       #               CBandSpeed 100kb 10 5
+       #
+       #               # 10kb/s, 3 request/s -> speed limit for any remote client, max 5 connections
+       #               CBandRemoteSpeed 10kb/s 3 5
+       #       </IfModule>
+       # </VirtualHost>
+
+</IfModule>