pridana hlavicka souboru; pridana promenna BASEDIR; zmena nazvu promennych; zmena popisnych textu

src/warden-client/etc/warden-client.conf

 #
-# warden-client.conf - configuration file for the warden sender/receiver client
+# warden-client.conf - configuration file for the Warden client
 #
+# Copyright (C) 2011-2015 Cesnet z.s.p.o
+#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+#-------------------------------------------------------------------------------
+# BASEDIR - base directory of Warden client
+#-------------------------------------------------------------------------------
+$BASEDIR = "/opt/warden-client";
 
 #-------------------------------------------------------------------------------
 # URI - URI address of Warden server
 #-------------------------------------------------------------------------------
-$URI = "https://warden-c.cesnet.cz:443/Warden";
+$URI = "https://warden.cesnet.cz:443/Warden";
 
 #-------------------------------------------------------------------------------
-# SSL_KEY_FILE - path to client SSL certificate key file
+# SSL_KEY - path to client SSL key
 #-------------------------------------------------------------------------------
-$SSL_KEY_FILE = "/opt/warden-client/etc/warden-client-key.pem";
+$SSL_KEY = "/etc/ssl/private/warden.cesnet.cz.key";
 
 #-------------------------------------------------------------------------------
-# SSL_CERT_FILE - path to client SSL certificate file
+# SSL_CERT - path to client SSL certificate
 #-------------------------------------------------------------------------------
-$SSL_CERT_FILE = "/opt/warden-client/etc/warden-client-cert.pem";
+$SSL_CERT = "/etc/ssl/certs/warden.cesnet.cz.pem";
 
 #-------------------------------------------------------------------------------
-# SSL_CA_FILE - path to CA certificate file
+# SSL_CA_CERT - path to CA certificate
 #-------------------------------------------------------------------------------
-$SSL_CA_FILE = "/opt/warden-client/etc/tcs-ca-bundle.pem";
+$SSL_CA_CERT = "/etc/ssl/certs/tcs-ca-bundle.pem";
 
 #-------------------------------------------------------------------------------
 # MAX_RCV_EVENTS_LIMIT - maximum number of events the client is allowd to get
-#                        from the Warden server in one batch
+#                        from the Warden server in one batch. 6000 events
+#                        consumes app. 250 MB of memory
 #-------------------------------------------------------------------------------
-$MAX_RCV_EVENTS_LIMIT = 6000; #consumes app. 250 MB of memory
-
+$MAX_RCV_EVENTS_LIMIT = 6000;
+ 
 #-------------------------------------------------------------------------------
 # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden
 #                      server. If your client timeouts, consider using higher
@@ -37,23 +46,21 @@ $MAX_RCV_EVENTS_LIMIT = 6000; #consumes app. 250 MB of memory
 $CONNECTION_TIMEOUT = 60;
 
 #-------------------------------------------------------------------------------
-# Log options
-#
-# LOG_STDERR, LOG_SYSLOG - hide (0) or allow (1) error reporting on STDERR
-#                          and/or to Syslog
-# LOG_STDERR_VERBOSE, LOG_SYSLOG_VERBOSE - print only error message without
-#                                          a stack (0) or print debug info
-#                                          including err. message and stack (1)
+# LOG_STDERR - enable/disable error reporting to stderr
 #-------------------------------------------------------------------------------
 $LOG_STDERR = 1;
 
-$LOG_SYSLOG = 0;
-$LOG_SYSLOG_FACILITY = "local7";
-
-$LOG_VERBOSE = 1;
-
-
-
-1;
+#-------------------------------------------------------------------------------
+# SYSLOG - enable/disable syslog logging
+#-------------------------------------------------------------------------------
+$SYSLOG = 1;
 
+#-------------------------------------------------------------------------------
+# SYSLOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
+#-------------------------------------------------------------------------------
+$SYSLOG_VERBOSE = 1;
 
+#-------------------------------------------------------------------------------
+# SYSLOG_FACILITY - syslog facility
+#-------------------------------------------------------------------------------
+$SYSLOG_FACILITY = "local7";