diff --git a/src/warden-server/doc/AUTHORS b/src/warden-server/doc/AUTHORS
index 836f0d9a222692f572df8525bc3abed999f9cd0d..b0c9bfbfd1aea60c199b608c2684d678fcdf0988 100644
--- a/src/warden-server/doc/AUTHORS
+++ b/src/warden-server/doc/AUTHORS
@@ -23,3 +23,8 @@ Radomir Orkac <orkac@cesnet.cz>
Daniel Studeny <Daniel.Studeny@cesnet.cz>
Pavel Vachek <Pavel.Vachek@cesnet.cz>
Martin Zadnik <izadnik@fit.vutbr.cz>
+
+
+--------------------------------------------------------------------------------
+
+Copyright (C) 2011-2014 Cesnet z.s.p.o
diff --git a/src/warden-server/doc/CHANGELOG b/src/warden-server/doc/CHANGELOG
index e2335308fecf464894ff8949eb80a1f75046af7c..a4597dc558cc69215e7833190ef13eb9e401d5e8 100644
--- a/src/warden-server/doc/CHANGELOG
+++ b/src/warden-server/doc/CHANGELOG
@@ -1,7 +1,8 @@
2014-??-?? v2.2 stable version
------------------------------
-- fixed bug in re-activation of invalid clients
-- fixed bug in disabling of validation hash
+- fixed bug of re-activation of invalid clients
+- fixed bug of disabling of validation hash
+- fixed bug of registerSender and registerReceiver scripts
- added user specified client ID
- added Warden Watchdog system
- added validity system of events and clients
@@ -10,27 +11,27 @@
- deleted obsolete items of evens
- enhanced getClients and getStatus scripts
- enhanced client's managment system
-- enhanced database schema
-- other minor bugs
+- enhanced database schema and indexes
+- enhanced installation scripts
+- other minor bugs and issues fixed
2012-11-16 v2.1 stable version
------------------------------
-- fixed bug in default value of database timestamp type (#576, #577)
-- fixed bug in getStatus function (#566)
-- fixed bug in re-registration check of client (#541)
-- added Syslog logging support (#578)
-- added update process (#573)
-- added server limit of maximum number of events that can be (#526)
+- fixed bug in default value of database timestamp type
+- fixed bug in getStatus function
+- fixed bug in re-registration check of client
+- added Syslog logging support
+- added update process
+- added server limit of maximum number of events that can be
delivered to one client in one batch
-- added validation of received events parameters (#524)
-- server can provide clients with events disregarding event (#523)
- type
-- added verbose logging option (stack info) (#521)
-- enhanced call of database error function (#549)
-- enhanced response time of getStatus function (#546)
-- enhanced server logging/warning function (#534)
-- enhanced reading of configuration files (#533)
+- added validation of received events parameters
+- server can provide clients with events disregarding event type
+- added verbose logging option (stack info)
+- enhanced call of database error function
+- enhanced response time of getStatus function
+- enhanced server logging/warning function
+- enhanced reading of configuration files
- other minor bugs and issues fixed
@@ -38,9 +39,9 @@
------------------------------
- MySQL database engine used
- Apache used to support faster multithread processing (communication switched to HTTPs protocol)
-- enhanced support of Alternate Names in SSL certificates (#505)
-- added automatic reconnect to DB (#494)
-- enhanced authentization and authorization (#495)
+- enhanced support of Alternate Names in SSL certificates
+- added automatic reconnect to DB
+- enhanced authentization and authorization
- other minor bugs and issues fixed
@@ -53,3 +54,8 @@
- Nagios system check supported
- automated installation and uninstallation process
- SQLite database engine used
+
+
+--------------------------------------------------------------------------------
+
+Copyright (C) 2011-2014 Cesnet z.s.p.o
diff --git a/src/warden-server/doc/INSTALL b/src/warden-server/doc/INSTALL
index 6a7e507b57d57c6f3dde597b9b4eea3d668301d4..8fe6d448e0bdde7c656bf6dbb02515ee99d793c2 100644
--- a/src/warden-server/doc/INSTALL
+++ b/src/warden-server/doc/INSTALL
@@ -52,7 +52,7 @@ D. Post-installation steps
- include parameters from the Warden server configuration file (<warden-server_path>/etc/warden-apache.conf)
- # vim /etc/apache2/sites-enabled/default(-ssl)
+ # vim /etc/apache2/sites-enabled/warden
<VirtualHost *:443>
...
@@ -93,9 +93,15 @@ D. Post-installation steps
4) Warden server configuration
- - configure warden-server.conf and warden-apache.conf placed in <warden-server_path>/etc directory
+ - configure warden-server.conf, warden-apache.conf and warden-watchdog.conf
+ placed in <warden-server_path>/etc directory
5) Restart of Apache server
# /etc/init.d/apache2 restart
+
+
+--------------------------------------------------------------------------------
+
+Copyright (C) 2011-2014 Cesnet z.s.p.o
diff --git a/src/warden-server/doc/LICENSE b/src/warden-server/doc/LICENSE
index e50d3602f0db0e77cad78166544a934282f66415..7b1325f23c3efafba7ee93cacb106757cdf51f30 100644
--- a/src/warden-server/doc/LICENSE
+++ b/src/warden-server/doc/LICENSE
@@ -25,3 +25,8 @@ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+--------------------------------------------------------------------------------
+
+Copyright (C) 2011-2014 Cesnet z.s.p.o
diff --git a/src/warden-server/doc/README b/src/warden-server/doc/README
index 0bddb0df09c7cbf821e5cc4aec339bbb4a18bf2e..fd8db2b02f8b4f906343a4ef70766e0636d44a86 100644
--- a/src/warden-server/doc/README
+++ b/src/warden-server/doc/README
@@ -404,10 +404,11 @@ I. Warden Watchdog
then run in this defined time interval.
USAGE:
- ./wardenWatchdog.pl -c /path/WardenWatchdog.conf -i 7
+ /<path_to_warden_server>/bin/wardenWatchdog.pl -c /<path_to_warden_server>/etc/WardenWatchdog.conf -i 7
CRON USAGE:
- 33 00 * * * /full/path/watchdog/wardenWatchdog.pl -c /path/WardenWatchdog.conf -i 7 >> err.txt
+ 33 00 * * * /<path_to_warden_server>/bin/wardenWatchdog.pl -c /<path_to_warden_server>/etc/WardenWatchdog.conf -i 7 >> /tmp/wardenWatchdog_err.log
+
--------------------------------------------------------------------------------
diff --git a/src/warden-server/doc/UNINSTALL b/src/warden-server/doc/UNINSTALL
index 4bac7ef5cfc0fb140c9e2806b0b5cec3b5de09f7..f0e7b05f169b773d76cdc838ad5fd870a530af76 100644
--- a/src/warden-server/doc/UNINSTALL
+++ b/src/warden-server/doc/UNINSTALL
@@ -20,7 +20,12 @@ For more information about uninstall.sh options run uninstall.sh -h.
B. Uninstallation step
----------------------
-1) Uninstall Warden server package (example)
+1) Stop Apache server
+
+ # /etc/init.d/apache2 stop
+
+
+2) Uninstall Warden server package (example)
$ /opt/warden-server/uninstall.sh -d /opt/warden-server
@@ -32,23 +37,18 @@ B. Uninstallation step
C. Post-uninstallation steps
----------------------------
-1) Stop Apache server
-
- # /etc/init.d/apache2 stop
-
-
-2) Disable of mod_ssl module
+1) Disable of mod_ssl module
# a2dismod ssl
-3) Remove Apache server configuration
+2) Remove Apache server configuration
a) VirtualHost section configuration
- remove include parameters from the Warden server configuration file (<warden-server_path>/etc/warden-apache.conf)
- # vim /etc/apache2/sites-enables/default(-ssl)
+ # vim /etc/apache2/sites-enables/warden
<VirtualHost *:443>
...
@@ -78,18 +78,22 @@ C. Post-uninstallation steps
KeepAlive Off
-4) Drop MySQL database
+3) Drop MySQL database
$ mysql -u <user> -h localhost -p <password>
mysql> DROP DATABASE warden;
- mysql> exit
+ mysql> exit;
-5) Uninstall unnecessary packages (optional)
+4) Uninstall unnecessary packages (optional)
# aptitude remove apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
-6) Start Apache server
+5) Start Apache server
# /etc/init.d/apache2 start
+
+
+--------------------------------------------------------------------------------
+Copyright (C) 2011-2014 Cesnet z.s.p.o
diff --git a/src/warden-server/doc/UPDATE b/src/warden-server/doc/UPDATE
index 4a81a300552949c11cadae9dc3480a367926ec02..44f92b7de15c545fb24321232d396f2fe8b22625 100644
--- a/src/warden-server/doc/UPDATE
+++ b/src/warden-server/doc/UPDATE
@@ -34,7 +34,7 @@ C. Post-update steps
1) Upgrade Warden server database
- $ mysql -u <user> -h localhost -p <password> < {warden-server_path}/doc/warden21to22.patch
+ $ mysql -u <user> -h localhost -p <password> < {path_to_warden_server}/doc/warden21to22.patch
ATTENTION: Running of the database update script may take a long time (in minutes - depending on the size of the database).
@@ -44,3 +44,8 @@ During this process the database will be not available!
2) Restart Apache server
# /etc/init.d/apache2 restart
+
+
+--------------------------------------------------------------------------------
+
+Copyright (C) 2011-2014 Cesnet z.s.p.o