From 0fe8834fc34387fabeabacceec243b14363400e9 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 26 May 2014 10:40:12 +0200
Subject: [PATCH] zmena zjistovani promennych pomoci fgrep -> promenne totiz
nejsou prirazene
---
src/warden-server/sh/update.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 1258a4a..fb7b61a 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -281,10 +281,14 @@ doTemplate \
# update Apache configuration file
echo -n "Updating Apache configuration file ... "
-cert_file=$(getConfValue "$apache_conf" CERT_FILE)
-key_file=$(getConfValue "$apache_conf" KEY_FILE)
-ca_file=$(getConfValue "$apache_conf" CA_FILE)
-lib=$(getConfValue "$apache_conf" LIB)
+cert_file_tmp=`fgrep SSLCertificateFile $apache_conf`
+key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf`
+ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf`
+lib_tmp=`fgrep PerlSwitches $apache_conf`
+cert_file=${cert_file_tmp##*" "}
+key_file=${key_file_tmp##*" "}
+ca_file=${ca_file_tmp##*" "}
+lib=${lib_tmp##*" "}
doTemplate \
_CERT_FILE_ "$cert_file" \
_KEY_FILE_ "$key_file" \
--
GitLab