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

diff -urN analog-4.16.org/analog.cfg analog-4.16/analog.cfg
--- analog-4.16.org/analog.cfg	Tue Feb 13 16:09:08 2001
+++ analog-4.16/analog.cfg	Mon Feb 26 21:04:14 2001
@@ -9,9 +9,10 @@
 # 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
 # OUTFILE outfile.html
-# HOSTNAME "[my organisation]"
+HOSTNAME "[PLD Linux Server]"
 # REQINCLUDE pages
 LINKINCLUDE pages
 REFLINKINCLUDE *
diff -urN analog-4.16.org/anlgform.html analog-4.16/anlgform.html
--- analog-4.16.org/anlgform.html	Tue Feb 13 16:09:08 2001
+++ analog-4.16/anlgform.html	Mon Feb 26 21:06:02 2001
@@ -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,11 +23,11 @@
 
 <!-- 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. If you do, you -->
 <!-- musn't also specify the LOGFILE in the "cg" configuration file above. -->
-<!-- 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-4.16.org/anlgform.pl analog-4.16/anlgform.pl
--- analog-4.16.org/anlgform.pl	Tue Feb 13 16:09:08 2001
+++ analog-4.16/anlgform.pl	Mon Feb 26 21:03:22 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-4.16.org/anlghea2.h analog-4.16/anlghea2.h
--- analog-4.16.org/anlghea2.h	Tue Feb 13 16:09:08 2001
+++ analog-4.16/anlghea2.h	Mon Feb 26 20:59:43 2001
@@ -50,16 +50,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 analog-4.16.org/anlghead.h analog-4.16/anlghead.h
--- analog-4.16.org/anlghead.h	Tue Feb 13 16:09:09 2001
+++ analog-4.16/anlghead.h	Mon Feb 26 21:02:30 2001
@@ -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/analog/analog-4.16/"
+#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. */
Commit	Line	Data
7213cced	1	diff -urN analog-4.16.org/analog.cfg analog-4.16/analog.cfg
	2	--- analog-4.16.org/analog.cfg Tue Feb 13 16:09:08 2001
	3	+++ analog-4.16/analog.cfg Mon Feb 26 21:04:14 2001
	4	@@ -9,9 +9,10 @@
4928cb62	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
7213cced	11	# OUTFILE outfile.html
	12	-# HOSTNAME "[my organisation]"
	13	+HOSTNAME "[PLD Linux Server]"
4928cb62	14	# REQINCLUDE pages
4928cb62	15	LINKINCLUDE pages
7213cced	16	REFLINKINCLUDE *
	17	diff -urN analog-4.16.org/anlgform.html analog-4.16/anlgform.html
	18	--- analog-4.16.org/anlgform.html Tue Feb 13 16:09:08 2001
	19	+++ analog-4.16/anlgform.html Mon Feb 26 21:06:02 2001
4928cb62	20	@@ -3,8 +3,7 @@
	21	</head>
	22
	23	<body>
	24	-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
	25	-
	26	+<h1><img src="/icons/analogo.gif" alt="Analog" --> Analog form interface</h1>
	27	<!-- Make the edits below. You also need to edit anlgform.pl. -->
	28
	29	<!-- First, uncomment the img tag above, edited if necessary. -->
7213cced	30	@@ -24,11 +23,11 @@
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
7213cced	37	<!-- Some users will want to set their logfile like this. If you do, you -->
7213cced	38	<!-- musn't also specify the LOGFILE in the "cg" configuration file above. -->
4928cb62	39	-<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" -->
	40	+<!-- input type=hidden name="LOGFILE" value="/usr/var/httpd/log/access_log" -->
	41
7213cced	42	<!-- After you've made these edits, you can remove the "strong" lines below -->
	43
	44	diff -urN analog-4.16.org/anlgform.pl analog-4.16/anlgform.pl
	45	--- analog-4.16.org/anlgform.pl Tue Feb 13 16:09:08 2001
	46	+++ analog-4.16/anlgform.pl Mon Feb 26 21:03:22 2001
	47	@@ -19,6 +19,7 @@
	48	# of Perl (don't remove the #! though).
	49	# 3) You also need to edit anlgform.html if you want to use the form.
	50	# 4) Add to the forbidden commands below if you want.
	51	+$analog = '/usr/bin/analog';
	52
	53	@forbidden = qw(LOGFORMAT APACHELOGFORMAT DEFAULTLOGFORMAT
	54	APACHEDEFAULTLOGFORMAT HEADERFILE FOOTERFILE UNCOMPRESS
	55	diff -urN analog-4.16.org/anlghea2.h analog-4.16/anlghea2.h
	56	--- analog-4.16.org/anlghea2.h Tue Feb 13 16:09:08 2001
	57	+++ analog-4.16/anlghea2.h Mon Feb 26 20:59:43 2001
	58	@@ -50,16 +50,16 @@
4928cb62	59	#endif
	60
	61	#ifndef LANGDIR
	62	-#define LANGDIR ANALOGDIR"lang/"
	63	+#define LANGDIR ANALOGDIR "/usr/share/analog/lang/"
	64	/* Directory where the language files live. */
	65	#endif
	66
	67	#ifndef NODNS
	68	-#define DNSFILE ANALOGDIR"dnscache"
e0ba949c	69	+#define DNSFILE ANALOGDIR "/var/lib/analog/dnscache"
4928cb62	70	/* where to store resolved addresses so we don't have to look them up next
	71	time */
	72
	73	-#define DNSLOCKFILE ANALOGDIR"dnslock"
	74	+#define DNSLOCKFILE ANALOGDIR "/var/lock/dnslock"
	75	/* A lock file to stop two processes trying to write the DNSFILE at once */
	76
	77	#define DNS (DNS_NONE)
7213cced	78	diff -urN analog-4.16.org/anlghead.h analog-4.16/anlghead.h
	79	--- analog-4.16.org/anlghead.h Tue Feb 13 16:09:09 2001
	80	+++ analog-4.16/anlghead.h Mon Feb 26 21:02:30 2001
4928cb62	81	@@ -19,19 +19,19 @@
4928cb62	82	#define ANLGHEAD
0b76998b AM	83
	84	#ifndef HOSTNAME
	85	-#define HOSTNAME "[my organisation]"
4928cb62	86	+#define HOSTNAME "[PLD Linux Server]"
0b76998b AM	87	/* the name of your organisation or WWW host. This is used for printing
	88	at the top of the output */
	89	#endif
	90
	91	#ifndef HOSTURL
	92	-#define HOSTURL "none"
	93	+#define HOSTURL "/"
	94	/* the URL of your host's home page, for linking to at the top of the
	95	output; use "none" for no linking. */
	96	#endif
	97
0b76998b	98	#ifndef ANALOGDIR
7213cced	99	-#define ANALOGDIR "/usr/local/analog/analog-4.16/"
4928cb62	100	+#define ANALOGDIR ""
	101	#endif
	102	/* The directory where your analog stuff lives (or will live). You need to
	103	get this right otherwise analog won't be able to find any of its auxiliary
	104	@@ -41,18 +41,18 @@
	105	which means the file analog.cfg within the ANALOGDIR. */
0b76998b AM	106
0b76998b AM	107	#ifndef LOGFILE
4928cb62	108	-#define LOGFILE "/usr/local/apache/logs/access_log"
0b76998b AM	109	+#define LOGFILE "/var/log/httpd/access_log"
	110	/* The name of the default logfile. Can be a list, separated by commas
	111	(but no spaces), and can include wild cards. */
	112	#endif
	113
4928cb62	114	#ifndef OUTFILE
	115	-#define OUTFILE "stdout"
	116	+#define OUTFILE "/home/httpd/html/usage/analog.html"
	117	/* The default file for output. Use "stdout" for stdout. */
	118	#endif
	119
0b76998b AM	120	#ifndef IMAGEDIR
	121	-#define IMAGEDIR "images/"
	122	+#define IMAGEDIR "/icons/"
	123	/* URL of the directory where the images for the graphical reports live.
	124	The URL can be absolute, or relative to the output page: e.g., just the
	125	empty string "" for the same directory as the output page. */
4928cb62	126	@@ -71,7 +71,7 @@
0b76998b AM	127	#endif
	128
	129	#ifndef DEFAULTCONFIGFILE
	130	-#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
4928cb62	131	+#define DEFAULTCONFIGFILE ANALOGDIR "/etc/analog.cfg"
0b76998b AM	132	/* the name of the default configuration file; see README.html for a
	133	description of this file. Use "none" (NOT ANALOGDIR"none"!) for no
	134	configuration file. */