From 37749948157127b88a619a45fb3e8fb231fcab34 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 1 Oct 2013 15:24:03 +0200
Subject: [PATCH] uprava help vypisu install.sh; uprava struktury balicky
 warden serveru

---
 src/warden-server/doc/README | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/warden-server/doc/README b/src/warden-server/doc/README
index cdb6cfa..e7e9730 100644
--- a/src/warden-server/doc/README
+++ b/src/warden-server/doc/README
@@ -27,17 +27,16 @@ A. Overall Information
 
     2.2 (2013-??-??)
 
-  3. Package structure
+  3. Installed package structure
 
-    warden-server/
-      bin/
+     bin/
         getClients.pl
         getStatus.pl
         registerReceiver.pl
         registerSender.pl
         unregisterClients.pl
         wardenWatchdog.pl
-      doc/
+     doc/
         AUTHORS
         CHANGELOG
         INSTALL
@@ -46,20 +45,21 @@ A. Overall Information
         README.wardenWatchdog
         UNINSTALL
         UPDATE
-        warden.mysql
         warden21to22.patch
-      etc/
+        warden.mysql
+     etc/
         package_version
         warden-apache.conf
         warden-server.conf
         WardenWatchdog.conf
-      lib/
-        Warden.pm
-        WardenCommon.pm
-        WardenWatchdog.pm
+     lib/
         Warden/
           ApacheDispatch.pm
-      uninstall.sh
+        WardenCommon.pm
+        Warden.pm
+        WardenWatchdog.pm
+     sh/	  
+       uninstall.sh
 
 
 --------------------------------------------------------------------------------
@@ -67,9 +67,9 @@ B. Installation Dependencies
  
  1. Applications:
 
-    Perl	>= 5.10.1
-    MySQL	>= 5.1.66
-    Apache	>= 2.2.16
+    Perl >= 5.10.1
+    MySQL >= 5.1.66
+    Apache >= 2.2.16
 
  2. Perl modules:
 
@@ -107,11 +107,12 @@ C. Installation
     
     For more information about install.sh options run install.sh -h
 
-    Usage: $ ./install.sh -d <directory> -k <ssl_key_file> -c <ssl_cert_file> -a <ssl_ca_file> [-hV]"
+    Usage: $ ./install.sh -d <directory> -k <ssl_key_file> -c <ssl_cert_file> -a <ssl_ca_file> [-s <directory>] [-hV]"
 	-d <directory>            installation directory
 	-k <ssl_key_file>         SSL certificate key file path
 	-c <ssl_cert_file>        SSL certificate file path
 	-a <ssl_ca_file>          CA certificate file path
+	-s <directory>            directory for symlinks to Warden server control scripts (optional)
 	-h                        print this help
 	-V                        print script version number and exit
 
@@ -120,11 +121,12 @@ C. Installation
                             -k /etc/ssl/private/server.key
                             -c /etc/ssl/certs/server.pem                            
 			    -a /etc/ssl/certs/bundle.pem
+			    -s /usr/local/bin
 
  4. Configuration files
 
     You are advised to check configuration file warden-apache.conf and
-    warden-server.conf in warden-server/etc/ directory after installation.
+    warden-server.conf in 'etc' directory after installation.
     For more information about post-installation steps see INSTALL file in
     'doc' directory.
 
-- 
GitLab