X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=sample-configuration%2Fprometheus.conf;h=fff604bd79e175caf3c5791f15a122c577704315;hp=c2da92c88dc39df8295e16289a051da10ee484b9;hb=ae776b1091bfdea4e2764ccb2652471ee5c9ce00;hpb=128e038085291f40482e39e9481d47942af7ceee

diff --git a/sample-configuration/prometheus.conf b/sample-configuration/prometheus.conf
index c2da92c..fff604b 100644
--- a/sample-configuration/prometheus.conf
+++ b/sample-configuration/prometheus.conf
@@ -1,17 +1,15 @@
 #==========================================================================
-#
-#	Prometheus QoS - steal fire from your ISP !    
-#	"fair-per-IP" quality of service utility       
-#	requires Linux kernel with HTB qdisc enabled    
-#	GNUpyright(G)2007 Michael xChaos Polak, x@n.cz 
-#	Credits: CZFree.Net / Freegate / Deu / d@n.cz  
-#	...and Martin Devera for his HTB, of course ;-)
-#
+#Configuration for Arachne Labs gateway prometheus.brevnov.czf (10.11.10.1)
 #==========================================================================
 #Path to external utilities required to run iGW Prometheus:
 #--------------------------------------------------------------------------
 tc			/sbin/tc
 iptables		/sbin/iptables
+iptables-restore        /sbin/iptables-restore
+#========================================================================== 
+#Filename of iptables mangle table for iptables-restore 
+#--------------------------------------------------------------------------  
+iptables-file           /var/spool/prometheus.iptables 
 #==========================================================================
 #Filename of /etc/hosts - style IP address configuration file
 #--------------------------------------------------------------------------
@@ -41,8 +39,8 @@ wan-medium		100Mbit	#Mbit|kbit
 #guranted upload and download bandwidth FROM your ISP (in kbps, please!)
 #asymetry settings will be automaticaly calculated from these values
 #--------------------------------------------------------------------------
-wan-download		40000	#kbps
-wan-upload		40000	#kbps
+wan-download		40960	#kbps
+wan-upload		40960
 #==========================================================================
 #special QoS free zone (eg. free CZFree tranzit, etc.)
 #Apply QoS on HTTP proxy IP addres/port   
@@ -67,7 +65,7 @@ wifi-normal-asymetry-ratio	1	#2,4,etc. for relative upload shaping
 wifi-normal-asymetry-treshold	0	#kbps
 wifi-plus-asymetry-ratio	1
 wifi-plus-asymetry-treshold	0
-backbone-normal-asymetry-ratio	1
+backbone-normal-asymetry-ratio		1
 backbone-normal-asymetry-treshold	0
 backbone-plus-asymetry-ratio		1
 backbone-plus-asymetry-treshold		0
@@ -75,10 +73,14 @@ backbone-bezfup-asymetry-ratio		1
 backbone-bezfup-asymetry-treshold	0
 #==========================================================================
 #HTB fine tuning part I - common settings
+#type of traffic filtering  mark&filter or classify (without tc filter) 
 #--------------------------------------------------------------------------
 htb-nesting-limit	3	#0..4: HTB seems to have built-in limit
 htb-burst		32	#kbit
+htb-burst-group		32      #kbit (group level classes) 
+htb-burst-main 		64      #kbit (medium&line level classes - 1:1, 1:2) 
 htb-leaf-discipline	sfq perturb 5
+filter-type             classify #or mark 
 #==========================================================================
 #magic-include-upload - is data counter sum of upload and download ?
 #magic-priorities - prioty levels are used by magic-relative-prio
@@ -100,19 +102,19 @@ magic-treshold		2	#kbps
 #These settings are keyword-derived ! (see "keyword" section)
 #--------------------------------------------------------------------------
 wifi-normal-magic-relative-limit	8	#*kb/sec->MB/day
-wifi-normal-magic-relative-prio		6	#*kb/sec->MB/day
+wifi-normal-magic-relative-prio		4	#*kb/sec->MB/day
 wifi-normal-magic-fixed-limit		0	#MB, less then
 wifi-normal-magic-fixed-prio		0	#MB, less then
-wifi-plus-magic-relative-limit		12
+wifi-plus-magic-relative-limit		16
 wifi-plus-magic-relative-prio		8
 wifi-plus-magic-fixed-limit		0
 wifi-plus-magic-fixed-prio		0
-backbone-normal-magic-relative-limit	12
+backbone-normal-magic-relative-limit	16
 backbone-normal-magic-relative-prio	8
 backbone-normal-magic-fixed-limit	0
 backbone-normal-magic-fixed-prio	0
-backbone-plus-magic-relative-limit	16
-backbone-plus-magic-relative-prio	12
+backbone-plus-magic-relative-limit	32
+backbone-plus-magic-relative-prio	16
 backbone-plus-magic-fixed-limit		0
 backbone-plus-magic-fixed-prio		0
 backbone-bezfup-magic-relative-limit	0
@@ -142,12 +144,12 @@ backbone-bezfup-htb-ceil-malus		0
 #==========================================================================
 #Credit file settings - stores unused credit from previous runs
 #--------------------------------------------------------------------------
-credit-filename		/var/run/prometheus.credit
+credit-filename		/var/lib/misc/prometheus.credit
 credit-enable		1	#1=yes|0=no
 #==========================================================================
 #Log file names and directories
 #--------------------------------------------------------------------------
-log-filename		/var/log/prometheus
+log-filename		/var/log/prometheuslog
 log-traffic-directory	/var/www/logs/
 log-traffic-url-path    logs/
 #==========================================================================