X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=conf%2Fprometheus.conf;h=2160698b570a250b7034a36fdeb5a4915a09e11a;hb=0eb8bc04db3f6ed6d2df52d9d8b41a91ec9556a3;hp=2c90a301120eb6d4f3e19152a4755f62de4377df;hpb=5c7ce8ce582f05dad22cec8f41a80180f4c08e18;p=svn%2FPrometheus-QoS%2F.git

diff --git a/conf/prometheus.conf b/conf/prometheus.conf
index 2c90a30..2160698 100644
--- a/conf/prometheus.conf
+++ b/conf/prometheus.conf
@@ -11,8 +11,8 @@
 #Path to external utilities required to run iGW Prometheus:
 #--------------------------------------------------------------------------
 tc			/sbin/tc
-iptables		/usr/sbin/iptables
-iptables-restore	/usr/sbin/iptables-restore
+iptables		/sbin/iptables
+iptables-restore	/sbin/iptables-restore
 #==========================================================================
 #Filename of iptables mangle table for iptables-restore
 #-------------------------------------------------------------------------- 
@@ -82,11 +82,9 @@ htb-r2q		1
 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
 #magic-treshold - heaviest downloader: htb-rate, 2nd: htb-rate+magic-treshold
 #==========================================================================
 magic-include-upload	1	#1=yes|0=no
-magic-priorities	8	#number of priority levels - 2
 magic-treshold		2	#kbps
 #--------------------------------------------------------------------------
 #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil:
@@ -113,10 +111,10 @@ adsl-prometheus-magic-fixed-prio		0
 #--------------------------------------------------------------------------
 #These settings are keyword-derived ! (see "keyword" section)
 #--------------------------------------------------------------------------
-via-prometheus-htb-default-prio		1	#can be 1...magic-priorities-2
+via-prometheus-htb-default-prio		1	#can be 1...7
 via-prometheus-htb-rate-bonus		0	#kbps
 via-prometheus-htb-ceil-malus		0	#kbps
-adsl-prometheus-htb-default-prio	1	
+adsl-prometheus-htb-default-prio	1
 adsl-prometheus-htb-rate-bonus		16
 adsl-prometheus-htb-ceil-malus		0
 #==========================================================================
@@ -131,14 +129,15 @@ adsl-prometheus-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-traffic-directory	/var/www/logs/
-log-traffic-url-path    logs/
+log-filename			/var/log/prometheuslog
+log-traffic-directory		/var/www/logs/
+log-traffic-html-directory	/var/www/logs/html/
+log-traffic-url-path		logs/
 #==========================================================================
 #Hall of Fame - Greatest Suckers settings
 #--------------------------------------------------------------------------