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

diff -urN analog-5.0.org/analog.cfg analog-5.0/analog.cfg
--- analog-5.0.org/analog.cfg	Tue May  1 12:38:24 2001
+++ analog-5.0/analog.cfg	Mon May 14 00:56:08 2001
@@ -9,10 +9,11 @@
 # 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 commands.
-LOGFILE logfile.log
+LOGFILE /var/log/httpd/access_log
+LANGUAGE POLISH
 # LOGFILE /old/logs/access_log.*
 # OUTFILE Report.html
-# HOSTNAME "[my organisation]"
+HOSTNAME "[PLD Linux Server]"
 # REQINCLUDE pages
 REQLINKINCLUDE pages
 REFLINKINCLUDE *
diff -urN analog-5.0.org/anlgform.html analog-5.0/anlgform.html
--- analog-5.0.org/anlgform.html	Tue May  1 12:38:24 2001
+++ analog-5.0/anlgform.html	Mon May 14 00:57:26 2001
@@ -3,7 +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. -->
 
@@ -15,10 +15,10 @@
 
 <!-- Many systems will want the IMAGEDIR to be different on the form -->
 <!-- than from the command line, 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" -->
 
 <!-- After you've made these edits, you can remove the "strong" lines below -->
 
diff -urN analog-5.0.org/anlgform.pl analog-5.0/anlgform.pl
--- analog-5.0.org/anlgform.pl	Tue May  1 12:38:24 2001
+++ analog-5.0/anlgform.pl	Mon May 14 00:58:03 2001
@@ -19,6 +19,7 @@
 #    of Perl (don't remove the #! though).
 # 3) You also need to edit anlgform.html if you want to use the form.
 # 4) Add to the forbidden commands below if you want.
+$analog = '/usr/bin/analog';
 
 @forbidden = qw(LOGFORMAT APACHELOGFORMAT DEFAULTLOGFORMAT
 		APACHEDEFAULTLOGFORMAT HEADERFILE FOOTERFILE UNCOMPRESS
diff -urN analog-5.0.org/src/anlghea2.h analog-5.0/src/anlghea2.h
--- analog-5.0.org/src/anlghea2.h	Tue May  1 12:38:33 2001
+++ analog-5.0/src/anlghea2.h	Mon May 14 01:05:03 2001
@@ -50,11 +50,11 @@
 #endif
 
 #ifndef NODNS
-#define DNSFILE "dnscache"
+#define DNSFILE "/var/lib/analog/dnscache"
 /* where to store resolved addresses so we don't have to look them up next
    time */
 
-#define DNSLOCKFILE "dnslock"
+#define DNSLOCKFILE "/var/lock/dnslock"
 /* A lock file to stop two processes trying to write the DNSFILE at once */ 
 
 #define DNS (DNS_NONE)
diff -urN analog-5.0.org/src/anlghead.h analog-5.0/src/anlghead.h
--- analog-5.0.org/src/anlghead.h	Tue May  1 12:38:33 2001
+++ analog-5.0/src/anlghead.h	Mon May 14 01:06:40 2001
@@ -19,30 +19,30 @@
 #define ANLGHEAD_H
 
 #ifndef HOSTNAME
-#define HOSTNAME "[my organisation]"
+#define HOSTNAME "[PLD Linux Server]"
 /* The name of your organisation or web server. 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 LOGFILE
-#define LOGFILE "logfile.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. */
@@ -61,7 +61,7 @@
 #endif
 
 #ifndef DEFAULTCONFIGFILE
-#define DEFAULTCONFIGFILE "analog.cfg"
+#define DEFAULTCONFIGFILE "/etc/analog.cfg"
 /* The name of the default configuration file. */
 #endif
 
@@ -82,7 +82,7 @@
    directory. This may or may not work, so it's better to specify a location
    explicitly here if you know where the files will be kept. */
 #ifndef LANGDIR
-#define LANGDIR NULL
+#define LANGDIR "/usr/share/analog/lang/"
 #endif
 /* Directory where the language files live. Actually, if this one is defined
    to be NULL, they will be looked for inside the "lang" subdirectory of the
Commit	Line	Data
95a6f835	1	diff -urN analog-5.0.org/analog.cfg analog-5.0/analog.cfg
	2	--- analog-5.0.org/analog.cfg Tue May 1 12:38:24 2001
	3	+++ analog-5.0/analog.cfg Mon May 14 00:56:08 2001
	4	@@ -9,10 +9,11 @@
4928cb62	5	# There is a much more extensive configuration file in examples/big.cfg
4928cb62	6	#
95a6f835	7	# If you need a LOGFORMAT command it must go here, above the LOGFILE commands.
95a6f835	8	-LOGFILE logfile.log
4928cb62	9	+LOGFILE /var/log/httpd/access_log
4928cb62	10	+LANGUAGE POLISH
95a6f835	11	# LOGFILE /old/logs/access_log.*
95a6f835	12	# OUTFILE Report.html
7213cced	13	-# HOSTNAME "[my organisation]"
7213cced	14	+HOSTNAME "[PLD Linux Server]"
4928cb62	15	# REQINCLUDE pages
95a6f835	16	REQLINKINCLUDE pages
7213cced	17	REFLINKINCLUDE *
95a6f835	18	diff -urN analog-5.0.org/anlgform.html analog-5.0/anlgform.html
	19	--- analog-5.0.org/anlgform.html Tue May 1 12:38:24 2001
	20	+++ analog-5.0/anlgform.html Mon May 14 00:57:26 2001
	21	@@ -3,7 +3,7 @@
4928cb62	22	</head>
	23
	24	<body>
	25	-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
4928cb62	26	+<h1><img src="/icons/analogo.gif" alt="Analog" --> Analog form interface</h1>
95a6f835	27
4928cb62	28	<!-- Make the edits below. You also need to edit anlgform.pl. -->
4928cb62	29
95a6f835	30	@@ -15,10 +15,10 @@
4928cb62	31
7213cced	32	<!-- Many systems will want the IMAGEDIR to be different on the form -->
7213cced	33	<!-- than from the command line, because it should not be within /cgi-bin/ -->
4928cb62	34	-<!-- input type=hidden name="IMAGEDIR" value="/images/" -->
	35	+<!-- input type=hidden name="IMAGEDIR" value="/icons/" -->
	36
95a6f835	37	<!-- Some users will want to set their logfile like this. -->
4928cb62	38	-<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" -->
	39	+<!-- input type=hidden name="LOGFILE" value="/usr/var/httpd/log/access_log" -->
	40
7213cced	41	<!-- After you've made these edits, you can remove the "strong" lines below -->
7213cced	42
95a6f835	43	diff -urN analog-5.0.org/anlgform.pl analog-5.0/anlgform.pl
	44	--- analog-5.0.org/anlgform.pl Tue May 1 12:38:24 2001
	45	+++ analog-5.0/anlgform.pl Mon May 14 00:58:03 2001
7213cced	46	@@ -19,6 +19,7 @@
	47	# of Perl (don't remove the #! though).
	48	# 3) You also need to edit anlgform.html if you want to use the form.
	49	# 4) Add to the forbidden commands below if you want.
	50	+$analog = '/usr/bin/analog';
	51
	52	@forbidden = qw(LOGFORMAT APACHELOGFORMAT DEFAULTLOGFORMAT
	53	APACHEDEFAULTLOGFORMAT HEADERFILE FOOTERFILE UNCOMPRESS
95a6f835	54	diff -urN analog-5.0.org/src/anlghea2.h analog-5.0/src/anlghea2.h
	55	--- analog-5.0.org/src/anlghea2.h Tue May 1 12:38:33 2001
	56	+++ analog-5.0/src/anlghea2.h Mon May 14 01:05:03 2001
	57	@@ -50,11 +50,11 @@
4928cb62	58	#endif
	59
	60	#ifndef NODNS
95a6f835	61	-#define DNSFILE "dnscache"
95a6f835	62	+#define DNSFILE "/var/lib/analog/dnscache"
4928cb62	63	/* where to store resolved addresses so we don't have to look them up next
	64	time */
	65
95a6f835	66	-#define DNSLOCKFILE "dnslock"
95a6f835	67	+#define DNSLOCKFILE "/var/lock/dnslock"
4928cb62	68	/* A lock file to stop two processes trying to write the DNSFILE at once */
	69
	70	#define DNS (DNS_NONE)
95a6f835	71	diff -urN analog-5.0.org/src/anlghead.h analog-5.0/src/anlghead.h
	72	--- analog-5.0.org/src/anlghead.h Tue May 1 12:38:33 2001
	73	+++ analog-5.0/src/anlghead.h Mon May 14 01:06:40 2001
	74	@@ -19,30 +19,30 @@
	75	#define ANLGHEAD_H
0b76998b AM	76
	77	#ifndef HOSTNAME
	78	-#define HOSTNAME "[my organisation]"
4928cb62	79	+#define HOSTNAME "[PLD Linux Server]"
95a6f835	80	/* The name of your organisation or web server. This is used for printing
95a6f835	81	at the top of the output. */
0b76998b AM	82	#endif
	83
	84	#ifndef HOSTURL
	85	-#define HOSTURL "none"
	86	+#define HOSTURL "/"
95a6f835	87	/* The URL of your host's home page, for linking to at the top of the
0b76998b AM	88	output; use "none" for no linking. */
	89	#endif
	90
0b76998b	91	#ifndef LOGFILE
95a6f835	92	-#define LOGFILE "logfile.log"
0b76998b AM	93	+#define LOGFILE "/var/log/httpd/access_log"
	94	/* The name of the default logfile. Can be a list, separated by commas
	95	(but no spaces), and can include wild cards. */
	96	#endif
	97
4928cb62	98	#ifndef OUTFILE
	99	-#define OUTFILE "stdout"
	100	+#define OUTFILE "/home/httpd/html/usage/analog.html"
	101	/* The default file for output. Use "stdout" for stdout. */
	102	#endif
	103
0b76998b AM	104	#ifndef IMAGEDIR
	105	-#define IMAGEDIR "images/"
	106	+#define IMAGEDIR "/icons/"
	107	/* URL of the directory where the images for the graphical reports live.
	108	The URL can be absolute, or relative to the output page: e.g., just the
	109	empty string "" for the same directory as the output page. */
95a6f835	110	@@ -61,7 +61,7 @@
0b76998b AM	111	#endif
	112
	113	#ifndef DEFAULTCONFIGFILE
95a6f835	114	-#define DEFAULTCONFIGFILE "analog.cfg"
	115	+#define DEFAULTCONFIGFILE "/etc/analog.cfg"
	116	/* The name of the default configuration file. */
	117	#endif
	118
	119	@@ -82,7 +82,7 @@
	120	directory. This may or may not work, so it's better to specify a location
	121	explicitly here if you know where the files will be kept. */
	122	#ifndef LANGDIR
	123	-#define LANGDIR NULL
	124	+#define LANGDIR "/usr/share/analog/lang/"
	125	#endif
	126	/* Directory where the language files live. Actually, if this one is defined
	127	to be NULL, they will be looked for inside the "lang" subdirectory of the