head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2002.06.12.18.04.55;	author ijliao;	state dead;
branches;
next	1.1;

1.1
date	2002.05.28.17.24.24;	author ijliao;	state Exp;
branches;
next	;


desc
@@


1.2
log
@fix patch problem

PR:		38877
Reportted by:	David Marshall <marshall@@chezmarshall.com>
Submitted by:	maintainer
@
text
@--- bin/install-slashsite.old	Mon Mar 18 18:35:35 2002
+++ bin/install-slashsite	Mon Mar 18 18:42:08 2002
@@@@ -89,7 +89,7 @@@@
 
 # THIS IS DANGEROUS ... when run as root on a non-GNU
 # system, it can blank out the hostname entirely
-chomp($hostname_f = `hostname -f`);
+chomp($hostname_f = `hostname -f 2> /dev/null` || `hostname 2> /dev/null`);
 unless ($opts{'H'}) {
 	print "
 What is hostname of your Slash site
@@@@ -431,6 +431,7 @@@@
 sub apache_site_conf {
 	my $host_port = $hostname;
 	$host_port .= ":80" unless $host_port =~ /:/;
+	my $log_path = (-d '/usr/local/logs' ? "logs" : "/var/log");
 	my $text = qq|
 # note that if your site's path is a symlink, the
 # path listed here is most likely the actual path;
@@@@ -446,8 +447,8 @@@@
     ServerAdmin $email
     DocumentRoot $prefix_site/$sitename/htdocs
     ServerName $host_noport
-    ErrorLog logs/${sitename}_error_log
-    CustomLog logs/${sitename}_access_log common
+    ErrorLog $log_path/${sitename}_error_log
+    CustomLog $log_path/${sitename}_access_log common
 
     PerlSetupEnv On
     PerlSetEnv TZ GMT
@


1.1
log
@add slash 2.2.5
Slash-Like Automatic Storytelling Homepage system

PR:		36066
Submitted by:	Autrijus Tang <autrijus@@egb.elixus.org>
@
text
@@

