Odstraneni nepotrebnych polozek v konfiguracnim souboru serveru

Upraveni generovani konfiguracniho souboru serveru
Uprava warden-apache.readme

src/warden-server/bin/getStatus.pl

@@ -104,9 +104,9 @@ print "========================\n";
 print "SERVER_VERSION:\t\t$server_status[0]\n";
 #print "ADDRESS:\t\t$server_status[1]\n";
 #print "PORT:\t\t\t$server_status[2]\n";
-print "LOGDIR:\t\t\t$server_status[3]\n";
+#print "LOGDIR:\t\t\t$server_status[3]\n";
 #print "PIDDIR:\t\t\t$server_status[4]\n";
-print "VARDIR:\t\t\t$server_status[5]\n";
+#print "VARDIR:\t\t\t$server_status[5]\n";
 #print "SSL_KEY_FILE:\t\t$server_status[6]\n";
 #print "SSL_CERT_FILE:\t\t$server_status[7]\n";
 #print "SSLCA_FILE:\t\t$server_status[8]\n";

src/warden-server/doc/warden-apache.readme

@@ -25,7 +25,7 @@ INSTALACE
 	aptitude install libcrypt-x509-perl libmime-base64-perl
 
 
-Konfigurace
+KONFIGURACE
 ===========
 
 1) Nastaveni APACHE 
@@ -71,4 +71,17 @@ Konfigurace
 	b) Pro klienta a server na jednom stroji jsou zrejme treba 2 ruzne certifikaty (me to jinak nejde, zkuste;))
 
 
+SLEDOVATKO
+==========
+	
+	Pro sledovani stavu Apache, poctu prijatych udalosti, poctu klientu lze pouzit sledovatko
+	{warden-server}/bin/getWebStatus.sh		
+
+
+
+
+
+
+
+
 

src/warden-server/lib/Warden.pm

@@ -64,9 +64,9 @@ my $conf_file = "/opt/warden-server/etc/warden-server.conf";
 ## first declaration of globa variables from config file
 #our $ADDRESS		= undef;
 #our $PORT		= undef;
-our $LOGDIR		= undef;
+#our $LOGDIR		= undef;
 #our $PIDDIR		= undef;
-our $VARDIR		= undef;
+#our $VARDIR		= undef;
 #our $SSL_KEY_FILE	= undef;
 #our $SSL_CERT_FILE	= undef;
 #our $SSL_CA_FILE	= undef;
@@ -805,9 +805,9 @@ sub getStatus
       SOAP::Data->name(VERSION			=> $VERSION),
       #SOAP::Data->name(ADDRESS			=> $ADDRESS),
       #SOAP::Data->name(PORT			=> $PORT),
-      SOAP::Data->name(LOGDIR			=> $LOGDIR),
+      #SOAP::Data->name(LOGDIR			=> $LOGDIR),
       #SOAP::Data->name(PIDDIR			=> $PIDDIR),
-      SOAP::Data->name(VARDIR			=> $VARDIR),
+      #SOAP::Data->name(VARDIR			=> $VARDIR),
       #SOAP::Data->name(SSL_KEY_FILE		=> $SSL_KEY_FILE),
       #SOAP::Data->name(SSL_CERT_FILE		=> $SSL_CERT_FILE),
       #SOAP::Data->name(SSL_CA_FILE		=> $SSL_CA_FILE),

src/warden-server/lib/WardenStatus.pm

@@ -238,7 +238,7 @@ sub getStatus
   my $clients_sum	 	= $response_data->{'CLIENTS_SUM'};
 
   #my @server_status = ("$version", "$address", "$port", "$logdir", "$piddir", "$vardir", "$ssl_key_file_server", "$ssl_cert_file_server", "$ssl_ca_file_server", "$facility", "$db_size", "$events_sum", "$events_last_id", "$events_first_timestamp", "$events_last_timestamp", "$clients_sum");
-  my @server_status = ("$version", undef, undef, "$logdir", undef, "$vardir", undef, undef, undef, "$facility", "$db_size", "$events_sum", "$events_last_id", "$events_first_timestamp", "$events_last_timestamp", "$clients_sum");
+  my @server_status = ("$version", undef, undef, undef, undef, undef, undef, undef, undef, "$facility", "$db_size", "$events_sum", "$events_last_id", "$events_first_timestamp", "$events_last_timestamp", "$clients_sum");
   push(@status, \@server_status);
 
   $i++;

src/warden-server/sh/install.sh

@@ -236,51 +236,11 @@ make_server_conf()
 # warden-server.conf - configuration file for Warden server
 #
 
-#-------------------------------------------------------------------------------
-# ADDRESS - IP address of warden server
-#-------------------------------------------------------------------------------
-\$ADDRESS = \"${hostname}\";
-
-#-------------------------------------------------------------------------------
-# PORT - used TCP port for Warden server
-#-------------------------------------------------------------------------------
-\$PORT = \"443\";
-
 #-------------------------------------------------------------------------------
 # BASEDIR - base directory of Warden server
 #-------------------------------------------------------------------------------
 \$BASEDIR = \"${server_path}\";
 
-#-------------------------------------------------------------------------------
-# VARDIR - var directory
-#-------------------------------------------------------------------------------
-\$VARDIR = \"\$BASEDIR/var/\";
-
-#-------------------------------------------------------------------------------
-# LOGDIR - logging directory
-#-------------------------------------------------------------------------------
-\$LOGDIR = \"/var/log/\";
-
-#-------------------------------------------------------------------------------
-# PIDDIR - process ID directory
-#-------------------------------------------------------------------------------
-\$PIDDIR = \"/var/run/\";
-
-#-------------------------------------------------------------------------------
-# SSL_KEY_FILE - path to server SSL certificate key file
-#-------------------------------------------------------------------------------
-\$SSL_KEY_FILE = \"${key}\";
-
-#-------------------------------------------------------------------------------
-# SSL_CERT_FILE - path to server SSL certificate file
-#-------------------------------------------------------------------------------
-\$SSL_CERT_FILE = \"${cert}\";
-
-#-------------------------------------------------------------------------------
-# SSL_CA_FILE - path to CA ceritificate file
-#-------------------------------------------------------------------------------
-\$SSL_CA_FILE = \"${ca_file}\";
-
 #-------------------------------------------------------------------------------
 # FACILITY - syslog facility
 #-------------------------------------------------------------------------------