prometheus -2, prometheus -4

[svn/Prometheus-QoS/.git] / rpm / prometheus-conf-rh.patch

--- prometheus.c	2008-01-06 11:54:28.000000000 +0100
+++ prometheus-rh.c	2008-01-06 11:54:09.000000000 +0100
@@ -57,17 +57,17 @@
 char *mark="MARK";\r
 char *mark_iptables="MARK --set-mark ";\r
 int dry_run=0;                         /* preview - use puts() instead of system() */\r
-char *config="/etc/prometheus.conf";   /* main configuration file */\r
-char *hosts="/etc/hosts";              /* line bandwidth definition file */\r
+char *config="/etc/prometheus/prometheus.conf";   /* main configuration file */\r
+char *hosts="/etc/prometheus/hosts";              /* line bandwidth definition file */\r
 char *tc="/sbin/tc";                   /* requires tc with HTB support */\r
-char *iptables="/usr/sbin/iptables";       /* requires iptables utility */\r
-char *iptablessave="/usr/sbin/iptables-save"; /* new */\r
-char *iptablesrestore="/usr/sbin/iptables-restore";  /* new */\r
+char *iptables="/sbin/iptables";       /* requires iptables utility */\r
+char *iptablessave="/sbin/iptables-save"; /* new */\r
+char *iptablesrestore="/sbin/iptables-restore";  /* new */\r
 char *iptablesfile="/var/spool/prometheus.iptables";  /* new; file for iptables-restore*/\r
 char *iptablespreamble="*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";\r
 FILE *iptables_file=NULL;\r
-char *html="/var/www/traffic.html";    /* hall of fame filename */\r
-char *preview="/var/www/preview.html"; /* hall of fame preview */\r
+char *html="/var/www/html/traffic.html";    /* hall of fame filename */\r
+char *preview="/var/www/html/preview.html"; /* hall of fame preview */\r
 char *cmdlog="/var/log/prometheus";    /* command log filename */\r
 char *credit="/var/run/prometheus.credit";  /* credit log file */\r
 int enable_credit=1;                   /* enable credit file */\r
@@ -93,7 +93,7 @@
 int qos_free_delay=0;	  /* seconds to sleep before applying new QoS rules */\r
 int digital_divide=2;     /* controls digital divide weirdness ratio, 1...3 */ \r
 int max_nesting=3;	  /* maximum nesting of HTB clases, built-in maximum seems to be 4 */\r
-int htb_r2q=1;      \r
+int htb_r2q=1;\r
 int burst=8;		  /* HTB burst (in kbits) */\r
 int burst_main=64;\r
 int burst_group=32;\r