[packages/analog.git] / analog-config.patch

diff -urN analog4.03.orig/analog.cfg analog4.03/analog.cfg
--- analog4.03.orig/analog.cfg	Sat Jan 29 17:00:59 2000
+++ analog4.03/analog.cfg	Fri Feb  4 00:12:37 2000
@@ -7,7 +7,8 @@
 # There is a much more extensive configuration file in examples/big.cfg
 #
 # If you need a LOGFORMAT command it must go here, above the LOGFILE command.
-# LOGFILE logfile.log
+LOGFILE /var/log/httpd/access_log
+LANGUAGE POLISH
 # HOSTNAME "[my organisation]"
 # REQINCLUDE pages
 LINKINCLUDE pages
diff -urN analog4.03.orig/anlgform.html analog4.03/anlgform.html
--- analog4.03.orig/anlgform.html	Mon Nov  8 20:33:04 1999
+++ analog4.03/anlgform.html	Fri Feb  4 00:12:38 2000
@@ -3,8 +3,7 @@
 </head>
 
 <body>
-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
-
+<h1><img src="/icons/analogo.gif" alt="Analog" --> Analog form interface</h1>
 <!-- Make the edits below. You also need to edit anlgform.pl. -->
 
 <!-- First, uncomment the img tag above, edited if necessary. -->
@@ -24,10 +23,10 @@
 
 <!-- Many systems will want the IMAGEDIR to be different on the form... -->
 <!-- than from the commandline, because it should not be within /cgi-bin/ -->
-<!-- input type=hidden name="IMAGEDIR" value="/images/" -->
+<!-- input type=hidden name="IMAGEDIR" value="/icons/" -->
 
 <!-- Some users will want to set their logfile like this -->
-<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" -->
+<!-- input type=hidden name="LOGFILE" value="/usr/var/httpd/log/access_log" -->
 
 <hr>
 <h2>1. Report choices</h2>
diff -urN analog4.03.orig/anlghea2.h analog4.03/anlghea2.h
--- analog4.03.orig/anlghea2.h	Sat Jan 29 17:00:59 2000
+++ analog4.03/anlghea2.h	Fri Feb  4 00:12:38 2000
@@ -48,16 +48,16 @@
 #endif
 
 #ifndef LANGDIR
-#define LANGDIR ANALOGDIR"lang/"
+#define LANGDIR ANALOGDIR "/usr/share/analog/lang/"
 /* Directory where the language files live. */
 #endif
 
 #ifndef NODNS
-#define DNSFILE ANALOGDIR"dnscache"
+#define DNSFILE ANALOGDIR "/var/lib/analog/dnscache"
 /* where to store resolved addresses so we don't have to look them up next
    time */
 
-#define DNSLOCKFILE ANALOGDIR"dnslock"
+#define DNSLOCKFILE ANALOGDIR "/var/lock/dnslock"
 /* A lock file to stop two processes trying to write the DNSFILE at once */ 
 
 #define DNS (DNS_NONE)
diff -urN analog4.03.orig/anlghead.h analog4.03/anlghead.h
--- analog4.03.orig/anlghead.h	Sat Jan 29 17:01:09 2000
+++ analog4.03/anlghead.h	Fri Feb  4 00:12:39 2000
@@ -19,19 +19,19 @@
 #define ANLGHEAD
 
 #ifndef HOSTNAME
-#define HOSTNAME "[my organisation]"
+#define HOSTNAME "[PLD Linux Server]"
 /* the name of your organisation or WWW host. This is used for printing
    at the top of the output */
 #endif
 
 #ifndef HOSTURL
-#define HOSTURL "none"
+#define HOSTURL "/"
 /* the URL of your host's home page, for linking to at the top of the
    output; use "none" for no linking. */
 #endif
 
 #ifndef ANALOGDIR
-#define ANALOGDIR "/usr/local/analog4.03/"
+#define ANALOGDIR ""
 #endif
 /* The directory where your analog stuff lives (or will live). You need to
    get this right otherwise analog won't be able to find any of its auxiliary
@@ -41,18 +41,18 @@
    which means the file analog.cfg within the ANALOGDIR. */
 
 #ifndef LOGFILE
-#define LOGFILE "/usr/local/apache/logs/access_log"
+#define LOGFILE "/var/log/httpd/access_log"
 /* The name of the default logfile. Can be a list, separated by commas
    (but no spaces), and can include wild cards. */
 #endif
 
 #ifndef OUTFILE
-#define OUTFILE "stdout"
+#define OUTFILE "/home/httpd/html/usage/analog.html"
 /* The default file for output. Use "stdout" for stdout. */
 #endif
 
 #ifndef IMAGEDIR
-#define IMAGEDIR "images/"
+#define IMAGEDIR "/icons/"
 /* URL of the directory where the images for the graphical reports live.
    The URL can be absolute, or relative to the output page: e.g., just the
    empty string "" for the same directory as the output page. */
@@ -71,7 +71,7 @@
 #endif
 
 #ifndef DEFAULTCONFIGFILE
-#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
+#define DEFAULTCONFIGFILE ANALOGDIR "/etc/analog.cfg"
 /* the name of the default configuration file; see README.html for a
    description of this file. Use "none" (NOT ANALOGDIR"none"!) for no
    configuration file. */
--- analog4.03.orig/anlgform.pl Sat Jan 29 17:00:59 2000
+++ analog4.03/anlgform.pl     Sat Feb  5 02:08:38 2000
@@ -14,6 +14,7 @@
 # 1) uncomment (remove everything before $analog) and edit one of the next
 # two
 #    lines to give the location (full pathname) of the analog executable.
 #       Unix: $analog = '/usr/local/etc/httpd/analog4.03/analog';
+$analog = '/usr/bin/analog';
 #       Windows: $analog = 'C:\program files\analog 4.03\analog.exe';
 # 2) If you're on Unix, edit the first line in this file to give the location
 #    of Perl (don't remove the #! though).
Commit	Line	Data
101002b1	1	diff -urN analog4.03.orig/analog.cfg analog4.03/analog.cfg
	2	--- analog4.03.orig/analog.cfg Sat Jan 29 17:00:59 2000
	3	+++ analog4.03/analog.cfg Fri Feb 4 00:12:37 2000
4928cb62	4	@@ -7,7 +7,8 @@
	5	# There is a much more extensive configuration file in examples/big.cfg
	6	#
	7	# If you need a LOGFORMAT command it must go here, above the LOGFILE command.
	8	-# LOGFILE logfile.log
	9	+LOGFILE /var/log/httpd/access_log
	10	+LANGUAGE POLISH
	11	# HOSTNAME "[my organisation]"
	12	# REQINCLUDE pages
	13	LINKINCLUDE pages
101002b1	14	diff -urN analog4.03.orig/anlgform.html analog4.03/anlgform.html
	15	--- analog4.03.orig/anlgform.html Mon Nov 8 20:33:04 1999
	16	+++ analog4.03/anlgform.html Fri Feb 4 00:12:38 2000
4928cb62	17	@@ -3,8 +3,7 @@
	18	</head>
	19
	20	<body>
	21	-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
	22	-
	23	+<h1><img src="/icons/analogo.gif" alt="Analog" --> Analog form interface</h1>
	24	<!-- Make the edits below. You also need to edit anlgform.pl. -->
	25
	26	<!-- First, uncomment the img tag above, edited if necessary. -->
	27	@@ -24,10 +23,10 @@
	28
	29	<!-- Many systems will want the IMAGEDIR to be different on the form... -->
	30	<!-- than from the commandline, because it should not be within /cgi-bin/ -->
	31	-<!-- input type=hidden name="IMAGEDIR" value="/images/" -->
	32	+<!-- input type=hidden name="IMAGEDIR" value="/icons/" -->
	33
	34	<!-- Some users will want to set their logfile like this -->
	35	-<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" -->
	36	+<!-- input type=hidden name="LOGFILE" value="/usr/var/httpd/log/access_log" -->
	37
	38	<hr>
	39	<h2>1. Report choices</h2>
101002b1	40	diff -urN analog4.03.orig/anlghea2.h analog4.03/anlghea2.h
	41	--- analog4.03.orig/anlghea2.h Sat Jan 29 17:00:59 2000
	42	+++ analog4.03/anlghea2.h Fri Feb 4 00:12:38 2000
4928cb62	43	@@ -48,16 +48,16 @@
	44	#endif
	45
	46	#ifndef LANGDIR
	47	-#define LANGDIR ANALOGDIR"lang/"
	48	+#define LANGDIR ANALOGDIR "/usr/share/analog/lang/"
	49	/* Directory where the language files live. */
	50	#endif
	51
	52	#ifndef NODNS
	53	-#define DNSFILE ANALOGDIR"dnscache"
e0ba949c	54	+#define DNSFILE ANALOGDIR "/var/lib/analog/dnscache"
4928cb62	55	/* where to store resolved addresses so we don't have to look them up next
	56	time */
	57
	58	-#define DNSLOCKFILE ANALOGDIR"dnslock"
	59	+#define DNSLOCKFILE ANALOGDIR "/var/lock/dnslock"
	60	/* A lock file to stop two processes trying to write the DNSFILE at once */
	61
	62	#define DNS (DNS_NONE)
101002b1	63	diff -urN analog4.03.orig/anlghead.h analog4.03/anlghead.h
	64	--- analog4.03.orig/anlghead.h Sat Jan 29 17:01:09 2000
	65	+++ analog4.03/anlghead.h Fri Feb 4 00:12:39 2000
4928cb62	66	@@ -19,19 +19,19 @@
4928cb62	67	#define ANLGHEAD
0b76998b AM	68
	69	#ifndef HOSTNAME
	70	-#define HOSTNAME "[my organisation]"
4928cb62	71	+#define HOSTNAME "[PLD Linux Server]"
0b76998b AM	72	/* the name of your organisation or WWW host. This is used for printing
	73	at the top of the output */
	74	#endif
	75
	76	#ifndef HOSTURL
	77	-#define HOSTURL "none"
	78	+#define HOSTURL "/"
	79	/* the URL of your host's home page, for linking to at the top of the
	80	output; use "none" for no linking. */
	81	#endif
	82
0b76998b	83	#ifndef ANALOGDIR
101002b1	84	-#define ANALOGDIR "/usr/local/analog4.03/"
4928cb62	85	+#define ANALOGDIR ""
	86	#endif
	87	/* The directory where your analog stuff lives (or will live). You need to
	88	get this right otherwise analog won't be able to find any of its auxiliary
	89	@@ -41,18 +41,18 @@
	90	which means the file analog.cfg within the ANALOGDIR. */
0b76998b AM	91
0b76998b AM	92	#ifndef LOGFILE
4928cb62	93	-#define LOGFILE "/usr/local/apache/logs/access_log"
0b76998b AM	94	+#define LOGFILE "/var/log/httpd/access_log"
	95	/* The name of the default logfile. Can be a list, separated by commas
	96	(but no spaces), and can include wild cards. */
	97	#endif
	98
4928cb62	99	#ifndef OUTFILE
	100	-#define OUTFILE "stdout"
	101	+#define OUTFILE "/home/httpd/html/usage/analog.html"
	102	/* The default file for output. Use "stdout" for stdout. */
	103	#endif
	104
0b76998b AM	105	#ifndef IMAGEDIR
	106	-#define IMAGEDIR "images/"
	107	+#define IMAGEDIR "/icons/"
	108	/* URL of the directory where the images for the graphical reports live.
	109	The URL can be absolute, or relative to the output page: e.g., just the
	110	empty string "" for the same directory as the output page. */
4928cb62	111	@@ -71,7 +71,7 @@
0b76998b AM	112	#endif
	113
	114	#ifndef DEFAULTCONFIGFILE
	115	-#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
4928cb62	116	+#define DEFAULTCONFIGFILE ANALOGDIR "/etc/analog.cfg"
0b76998b AM	117	/* the name of the default configuration file; see README.html for a
	118	description of this file. Use "none" (NOT ANALOGDIR"none"!) for no
	119	configuration file. */
101002b1	120	--- analog4.03.orig/anlgform.pl Sat Jan 29 17:00:59 2000
101002b1	121	+++ analog4.03/anlgform.pl Sat Feb 5 02:08:38 2000
a2a6b1f2	122	@@ -14,6 +14,7 @@
	123	# 1) uncomment (remove everything before $analog) and edit one of the next
	124	# two
	125	# lines to give the location (full pathname) of the analog executable.
101002b1	126	# Unix: $analog = '/usr/local/etc/httpd/analog4.03/analog';
a2a6b1f2	127	+$analog = '/usr/bin/analog';
101002b1	128	# Windows: $analog = 'C:\program files\analog 4.03\analog.exe';
a2a6b1f2	129	# 2) If you're on Unix, edit the first line in this file to give the location
	130	# of Perl (don't remove the #! though).
	131