From 75c66d468575b65f728dd474388189a2819494f4 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Wed, 23 Jan 2013 09:57:33 +0100
Subject: [PATCH] odstraneno generovani a update warden-client.conf
---
src/warden-server/sh/install.sh | 44 ++-------------------------------
src/warden-server/sh/update.sh | 44 ++-------------------------------
2 files changed, 4 insertions(+), 84 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index d54c4c6..6f382bd 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -7,7 +7,7 @@
# Use of this source is governed by a BSD-style license, see LICENSE file.
-VERSION="2.1"
+VERSION="2.2"
#-------------------------------------------------------------------------------
# FUNCTIONS
@@ -143,41 +143,6 @@ make_warden_dir()
}
-make_client_conf()
-{
- echo -n "Creating client configuration file ... "
- echo "#
-# warden-client.conf - configuration file for the warden sender/receiver client
-#
-
-#-------------------------------------------------------------------------------
-# URI - URI address of Warden server
-#-------------------------------------------------------------------------------
-\$URI = \"https://${hostname}:443/Warden\";
-
-#-------------------------------------------------------------------------------
-# SSL_KEY_FILE - path to client SSL certificate key file
-#-------------------------------------------------------------------------------
-\$SSL_KEY_FILE = \"${key}\";
-
-#-------------------------------------------------------------------------------
-# SSL_CERT_FILE - path to client SSL certificate file
-#-------------------------------------------------------------------------------
-\$SSL_CERT_FILE = \"${cert}\";
-
-#-------------------------------------------------------------------------------
-# SSL_CA_FILE - path to CA certificate file
-#-------------------------------------------------------------------------------
-\$SSL_CA_FILE = \"${ca_file}\";" > $client_conf 2> $err; ret_val=`echo $?`
-
- if [ $ret_val -eq 0 ]; then
- echo "OK"
- else
- err_clean
- fi
-}
-
-
make_server_conf()
{
echo -n "Creating server configuration file ... "
@@ -347,7 +312,6 @@ server_path="${prefix}/warden-server"
bin="${server_path}/bin"
local_bin="/usr/local/bin"
etc="${server_path}/etc"
-client_conf="${etc}/warden-client.conf"
server_conf="${etc}/warden-server.conf"
apache_conf="${etc}/warden-apache.conf"
var="${server_path}/var"
@@ -370,12 +334,9 @@ modules_chck
echo
echo "------------------------- Installation process --------------------------"
-# make warden client directory
+# make warden server directory
make_warden_dir
-# create client configuration file
-make_client_conf
-
# create server configuration file
make_server_conf
@@ -390,7 +351,6 @@ create_symlinks
echo
echo "Please check configuration files:"
-echo " - ${client_conf}"
echo " - ${server_conf}"
echo " - ${apache_conf}"
echo
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index d2aa402..da37d87 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -7,7 +7,7 @@
# Use of this source is governed by a BSD-style license, see LICENSE file.
-VERSION="2.1"
+VERSION="2.2"
#-------------------------------------------------------------------------------
# FUNCTIONS
@@ -210,45 +210,7 @@ $perl_switches
else
err_clean
fi
-
-#-------------------------------------------------------------------------------
-
- echo -n "Updating $client_conf_file ... "
-
- uri=`cat $client_conf_file | grep '$URI'`
- ssl_key_file=`cat $client_conf_file | grep '$SSL_KEY_FILE'`
- ssl_cert_file=`cat $client_conf_file | grep '$SSL_CERT_FILE'`
- ssl_ca_file=`cat $client_conf_file | grep '$SSL_CA_FILE'`
-
- echo "#
-# warden-client.conf - configuration file for registration and status clients
-#
-
-#-------------------------------------------------------------------------------
-# URI - URI address of Warden server
-#-------------------------------------------------------------------------------
-$uri
-
-#-------------------------------------------------------------------------------
-# SSL_KEY_FILE - path to server SSL certificate key file
-#-------------------------------------------------------------------------------
-$ssl_key_file
-
-#-------------------------------------------------------------------------------
-# SSL_CERT_FILE - path to server SSL certificate file
-#-------------------------------------------------------------------------------
-$ssl_cert_file
-
-#-------------------------------------------------------------------------------
-# SSL_CA_FILE - path to CA certificate file
-#-------------------------------------------------------------------------------
-$ssl_ca_file" > $client_conf_file 2> $err; ret_val=`echo $?`
-
- if [ $ret_val -eq 0 ]; then
- echo "OK"
- else
- err_clean
- fi
+
#-------------------------------------------------------------------------------
@@ -381,7 +343,6 @@ etc="${server_path}/etc"
doc="${server_path}/doc"
old_package_version_file="${etc}/package_version"
apache_conf_file="${etc}/warden-apache.conf"
-client_conf_file="${etc}/warden-client.conf"
server_conf_file="${etc}/warden-server.conf"
err="/tmp/warden-err"
backup_dir="/tmp/warden-server-backup"
@@ -420,7 +381,6 @@ echo
echo "Please check updated configuration files:"
echo " - $apache_conf_file"
echo " - $server_conf_file"
-echo " - $client_conf_file"
echo
echo "Warden server directory: $server_path"
echo
--
GitLab