SOURCES: inflow-config_location.patch (NEW), inflow-conf.patch (NEW) - adde...
blues
blues at pld-linux.org
Fri Aug 22 14:59:56 CEST 2008
Author: blues Date: Fri Aug 22 12:59:56 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added config_location and conf patches
---- Files affected:
SOURCES:
inflow-config_location.patch (NONE -> 1.1) (NEW), inflow-conf.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/inflow-config_location.patch
diff -u /dev/null SOURCES/inflow-config_location.patch:1.1
--- /dev/null Fri Aug 22 14:59:57 2008
+++ SOURCES/inflow-config_location.patch Fri Aug 22 14:59:50 2008
@@ -0,0 +1,44 @@
+--- ./inflow-stat.org 2008-08-21 16:57:36.587200193 +0200
++++ ./inflow-stat 2008-08-22 14:38:06.802106386 +0200
+@@ -38,7 +38,7 @@ $RELEASE = "V2.4.0";
+ #
+ # local settings ----------------------------------------------------
+ #
+-$INFLOWCONF = "/home/news/config/inflow.conf"; # ext. local configs (optional)
++$INFLOWCONF = "/etc/inflow/inflow.conf"; # ext. local configs (optional)
+ #
+ # the following settings may be modified by an external config file
+ #
+--- ./inflow-collect.org 2008-08-22 14:38:26.992311655 +0200
++++ ./inflow-collect 2008-08-22 14:39:10.628766794 +0200
+@@ -46,7 +46,7 @@ $RELEASE = "V2.4.0";
+
+ # config section -------------------------------------------------
+ #
+-$INFLOWCONF = "/home/news/config/inflow.conf"; # ext. local configs (optional)
++$INFLOWCONF = "/etc/inflow/inflow.conf"; # ext. local configs (optional)
+ #
+ # the following settings may be modified by an external config file
+ #
+--- ./inflow-plot.org 2008-08-22 14:39:21.035431539 +0200
++++ ./inflow-plot 2008-08-22 14:39:40.752099810 +0200
+@@ -33,7 +33,7 @@ $RELEASE = "V2.2.0";
+
+ ## ---- begin config section -------------------------------------------------
+ ##
+-$INFLOWCONF = "/home/news/config/inflow.conf"; # ext. local configs (optional)
++$INFLOWCONF = "/etc/inflow/inflow.conf"; # ext. local configs (optional)
+ ##
+ ## the following settings may be modified by an external config file
+ ##
+--- ./outflow-stat.org 2008-08-22 14:40:11.325426850 +0200
++++ ./outflow-stat 2008-08-22 14:40:02.485427182 +0200
+@@ -39,7 +39,7 @@ $RELEASE = "V2.3.1";
+
+ ## local settings ----------------------------------------------------
+ #
+-$INFLOWCONF = "/home/news/config/inflow.conf"; # ext. local configs (optional)
++$INFLOWCONF = "/etc/inflow/inflow.conf"; # ext. local configs (optional)
+ #
+ ## the following settings may be modified here or alternativly using
+ # an external config file; the latter method makes updates more comfortable...
================================================================
Index: SOURCES/inflow-conf.patch
diff -u /dev/null SOURCES/inflow-conf.patch:1.1
--- /dev/null Fri Aug 22 14:59:57 2008
+++ SOURCES/inflow-conf.patch Fri Aug 22 14:59:51 2008
@@ -0,0 +1,93 @@
+--- ./inflow.conf.org 2008-08-22 14:54:21.285757770 +0200
++++ ./inflow.conf 2008-08-22 14:54:13.302009858 +0200
+@@ -40,8 +40,8 @@ $INFLOWURL = "ftp://ftp.switch.ch/info_
+ # local HTML stuff: you can put custom header & footer information into
+ # local files; optional...
+ #
+-$HTMLHEADER = "/home/news/config/inflowhtmlheader";
+-$HTMLFOOTER = "/home/news/config/inflowhtmlfooter";
++$HTMLHEADER = "/etc/inflow/inflowhtmlheader";
++$HTMLFOOTER = "/etc/inflow/inflowhtmlfooter";
+ #
+ $BGCOLDARK = "#00E0FF"; # cell background dark
+ $BGCOLLIGHT = "#80F0FF"; # cell background light
+@@ -50,11 +50,11 @@ $BGCOLLIGHT = "#80F0FF"; # cell b
+ # The actual version of the global table can be downloaded from
+ # ftp://ftp.switch.ch/info_service/netnews/olm-lookup
+ #
+-$URLLOOKUP = "/home/news/config/olm-lookup"; # global
++$URLLOOKUP = "/etc/inflow/olm-lookup"; # global
+ $URLLUPLOC = ""; # local
+ #
+ # host filter list (optional), to be used with -r option
+-$HOSTFILTER= "/home/news/config/inflow.hostlist";
++$HOSTFILTER= "/etc/inflow/inflow.hostlist";
+ #
+ # file naming
+ #
+@@ -62,24 +62,24 @@ $WANTHOSTNAME = 0; # add hostname
+ #
+ # paths...
+ #
+-$HTMLDIR = "/opt/www/htdocs/news/status"; # where to put HTML output
+-$TEXTDIR = "/home/news/status"; # where to put ASCII output
++$HTMLDIR = "/var/lib/inflow/status"; # where to put HTML output
++$TEXTDIR = "/var/lib/inflow/status"; # where to put ASCII output
+
+ #
+ # inflow-collect -------------------------------------------------
+
+-$BATCHDIR = "/var/news/out.going"; # where INN puts data
++$BATCHDIR = "/var/spool/news/outgoing"; # where INN puts data
+ $CHANNEL = "INFLOW";
+-$SUMDIR = "/home/news/inflow"; # summaries from previous periods
++$SUMDIR = "/var/lib/inflow"; # summaries from previous periods
+ $SUMFILE = "inflow.sum";
+ #
+-$HOURDIR = "/home/news/inflow/hour"; # dir for hourly summaries
++$HOURDIR = "/var/lib/inflow/hour"; # dir for hourly summaries
+ $ROUNDTIME = 1; # round down hour file names to nearest
+ # 10 minutes (ex: ..-1401 -> ..1400)
+ # to get coherent data sequences
+ $TELLDUBIOUS = 0; # whether to warn for negative delays
+ #
+-$CTLINND = "/home/news/inn/bin/ctlinnd";
++$CTLINND = "/usr/bin/ctlinnd";
+ $TIMEOUT = 180; # ctlinnd timeout
+ $MAXAGE = 20; # minutes after midnight after which to cycle
+ # result file; sounds complicated, but this
+@@ -109,7 +109,7 @@ $PLOTSCRIPT = "inflow-plot -w"; # script
+
+ # inflow-plot ----------------------------------------------------
+
+-$WORKDIR = "/opt/www/htdocs/news/status/pics"; # dir to write pictures
++$WORKDIR = "/var/lib/inflow/status/pics"; # dir to write pictures
+ $PIC1 = "$WORKDIR/arthourpic"; # articles per hour
+ $PIC2 = "$WORKDIR/artcumpic"; # articles cumulative
+ $PIC3 = "$WORKDIR/volhourpic"; # volume per hour
+@@ -128,12 +128,8 @@ $THRESHOLDW = 5; # same for weekly
+ $RESOLVCONF = "/etc/resolv.conf";
+
+ # innfeed stuff
+-$IFSPOOLDIR = "/var/news/innfeed";
+- at INNFEEDCONF = ( '/home/news/config/innfeed1.conf',
+- '/home/news/config/innfeed2.conf',
+- '/home/news/config/innfeed3.conf',
+- '/home/news/config/innfeed4.conf',
+- );
++$IFSPOOLDIR = "/var/spool/news/outgoing";
++ at INNFEEDCONF = ( '/etc/news/innfeed.conf' );
+ $OLDCONFSTYLE = 0; # pre-0.10 innfeed uses old format for innfeed.conf
+ $CHKPT_FL = 0; # some innfeed versions use .checkpoint files
+ # some use .input for storing checkpoint info (>0.9.3)
+@@ -145,8 +141,8 @@ $THRES_MAGIC = 6500000; # do exact line
+ # threshold else do approximate line count
+ #
+ # nntpsend stuff
+-$NSSPOOLDIR = "/var/news/out.going";
+- at NNTPSENDCONF = ( '/home/news/config/nntpsend.ctl',);
++$NSSPOOLDIR = "/var/spool/news/outgoing";
++ at NNTPSENDCONF = ( '/etc/news/nntpsend.ctl',);
+ @NSPOSTFIXES = ( '', '!n', '.work', '.nntp' );
+ #
+ # naming stuff
================================================================
More information about the pld-cvs-commit
mailing list