From 5ceb2a99054cadb3b2593126016573f21106d9f5 Mon Sep 17 00:00:00 2001
From: slef <slef>
Date: Wed, 21 May 2003 21:47:05 +0000
Subject: [PATCH] Fixing httpd.conf to be koha-httpd.conf where necessary

---
 misc/Install.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/Install.pm b/misc/Install.pm
index ea6b755098..0c277a5f8b 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -1131,7 +1131,7 @@ sub updateapacheconf {
     my $logfiledir=`grep ^ErrorLog "$realhttpdconf"`;
     chomp $logfiledir;
     
-    my $httpdconf = $etcdir."/httpd.conf";
+    my $httpdconf = $etcdir."/koha-httpd.conf";
 
     if ($logfiledir) {
 	$logfiledir=~m#ErrorLog (.*)/[^/]*$#
@@ -1260,6 +1260,7 @@ $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank passwor
 sub basicauthentication {
     my $message=getmessage('IntranetAuthenticationQuestion');
     my $answer=showmessage($message, 'yn', 'y');
+    my $httpdconf = $etcdir."/koha-httpd.conf";
 
     my $apacheauthusername='librarian';
     my $apacheauthpassword='';
@@ -1278,7 +1279,7 @@ sub basicauthentication {
 	$salt.=substr($chars, int(rand(length($chars))),1);
 	print AUTH $apacheauthusername.":".crypt($apacheauthpassword, $salt)."\n";
 	close AUTH;
-	open(SITE,">>$realhttpdconf") or warn "Insufficient priveleges to open $realhttpdconf for writing.\n";
+	open(SITE,">>$httpdconf") or warn "Insufficient priveleges to open $realhttpdconf for writing.\n";
 	print SITE <<EOP
 
 <Directory $intranetdir>
-- 
2.39.2