From 9d3deb11c352dec00927e93be98393b27ed4bbe6 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Wed, 12 Dec 2012 15:13:52 +0100
Subject: [PATCH] odstranena zmena certifikatu v warden-apache.conf, zmena
ukazatele na soubor INSTALL
---
src/warden-server/sh/install.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index e67b198..0456d66 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -292,9 +292,6 @@ changeServerPath()
perl -pi -e "s#/opt#${prefix}#" ${bin}/$file
done
- echo "- update server path: $apache_conf"
- perl -pi -e "s#/opt#${prefix}#" $apache_conf
-
echo "- update server path: ${lib}/Warden.pm"
perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm
@@ -355,6 +352,7 @@ server_conf="${etc}/warden-server.conf"
apache_conf="${etc}/warden-apache.conf"
var="${server_path}/var"
lib="${server_path}/lib"
+doc="${server_path}/doc"
err="/tmp/warden-err"
# check if warden-server is installed
@@ -387,9 +385,6 @@ make_apache_conf
#update paths in utilities
changeServerPath
-#update paths in apachefile
-updateCertsPath
-
# crate symlinks from warden server bin directory to /usr/local/bin
create_symlinks
@@ -402,7 +397,7 @@ echo "Warden server directory: $server_path"
echo
echo "Installation of $package_version package was SUCCESSFUL!!!"
echo
-echo "Please follow post-installation steps in ${dirname}/doc/INSTALL!"
+echo "Please follow post-installation steps in ${doc}/INSTALL!"
# cleanup section
rm -rf $err
--
GitLab