From b971862220e6851605bfdc56b3b8fbf197a1a744 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 5 Jan 2015 13:10:30 +0100
Subject: [PATCH] odstraneni znaku _ z maker
---
src/warden-server/etc/warden-apache.conf.tmpl | 6 +--
.../etc/warden-apache.conf.tmpl.update | 6 +--
.../etc/warden-server.conf.tmpl.update | 16 +++----
.../etc/warden-watchdog.conf.tmpl | 2 +-
.../etc/warden-watchdog.conf.tmpl.update | 12 +++---
src/warden-server/sh/install.sh | 8 ++--
src/warden-server/sh/update.sh | 42 +++++++++----------
7 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/warden-server/etc/warden-apache.conf.tmpl b/src/warden-server/etc/warden-apache.conf.tmpl
index 842aac4..e5a71dc 100644
--- a/src/warden-server/etc/warden-apache.conf.tmpl
+++ b/src/warden-server/etc/warden-apache.conf.tmpl
@@ -13,9 +13,9 @@ SSLOptions +StdEnvVars +ExportCertData
SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
-SSLCertificateFile _CERT_FILE_
-SSLCertificateKeyFile _KEY_FILE_
-SSLCACertificateFile _CA_FILE_
+SSLCertificateFile _CERTFILE_
+SSLCertificateKeyFile _KEYFILE_
+SSLCACertificateFile _CAFILE_
PerlOptions +Parent
PerlSwitches -I _LIB_
diff --git a/src/warden-server/etc/warden-apache.conf.tmpl.update b/src/warden-server/etc/warden-apache.conf.tmpl.update
index 842aac4..e5a71dc 100644
--- a/src/warden-server/etc/warden-apache.conf.tmpl.update
+++ b/src/warden-server/etc/warden-apache.conf.tmpl.update
@@ -13,9 +13,9 @@ SSLOptions +StdEnvVars +ExportCertData
SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
-SSLCertificateFile _CERT_FILE_
-SSLCertificateKeyFile _KEY_FILE_
-SSLCACertificateFile _CA_FILE_
+SSLCertificateFile _CERTFILE_
+SSLCertificateKeyFile _KEYFILE_
+SSLCACertificateFile _CAFILE_
PerlOptions +Parent
PerlSwitches -I _LIB_
diff --git a/src/warden-server/etc/warden-server.conf.tmpl.update b/src/warden-server/etc/warden-server.conf.tmpl.update
index a51e046..3567d79 100644
--- a/src/warden-server/etc/warden-server.conf.tmpl.update
+++ b/src/warden-server/etc/warden-server.conf.tmpl.update
@@ -18,42 +18,42 @@ $SYSLOG = "_SYSLOG_";
#-------------------------------------------------------------------------------
# SYSLOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
#-------------------------------------------------------------------------------
-$SYSLOG_VERBOSE = "_SYSLOG_VERBOSE_";
+$SYSLOG_VERBOSE = "_SYSLOGVERBOSE_";
#-------------------------------------------------------------------------------
# SYSLOG_FACILITY - syslog facility
#-------------------------------------------------------------------------------
-$SYSLOG_FACILITY = "_SYSLOG_FACILITY_";
+$SYSLOG_FACILITY = "_SYSLOGFACILITY_";
#-------------------------------------------------------------------------------
# DB_NAME - MySQL database name of Warden server
#-------------------------------------------------------------------------------
-$DB_NAME = "_DB_NAME_";
+$DB_NAME = "_DBNAME_";
#-------------------------------------------------------------------------------
# DB_USER - MySQL database user of Warden server
#-------------------------------------------------------------------------------
-$DB_USER = "_DB_USER_";
+$DB_USER = "_DBUSER_";
#-------------------------------------------------------------------------------
# DB_PASS - MySQL database password of Warden server
#-------------------------------------------------------------------------------
-$DB_PASS = "_DB_PASS_";
+$DB_PASS = "_DBPASS_";
#-------------------------------------------------------------------------------
# DB_HOST - MySQL database host
#-------------------------------------------------------------------------------
-$DB_HOST = "_DB_HOST_";
+$DB_HOST = "_DBHOST_";
#-------------------------------------------------------------------------------
# MAX_EVENTS_LIMIT - server limit of maximum number of events that can be
# delivered to one client in one batch
#-------------------------------------------------------------------------------
-$MAX_EVENTS_LIMIT = "_MAX_EVENTS_LIMIT_";
+$MAX_EVENTS_LIMIT = "_MAXEVENTSLIMIT_";
#-------------------------------------------------------------------------------
# VALID_STRINGS - validation hash containing allowed event attributes
#-------------------------------------------------------------------------------
%VALID_STRINGS = (
-_VALID_STRINGS_
+_VALIDSTRINGS_
);
diff --git a/src/warden-server/etc/warden-watchdog.conf.tmpl b/src/warden-server/etc/warden-watchdog.conf.tmpl
index 682f8a2..baa4894 100644
--- a/src/warden-server/etc/warden-watchdog.conf.tmpl
+++ b/src/warden-server/etc/warden-watchdog.conf.tmpl
@@ -8,7 +8,7 @@
#-------------------------------------------------------------------------------
# DOMAIN_NAME - server full domain name
#-------------------------------------------------------------------------------
-$DOMAIN_NAME = "_DOMAIN_NAME_";
+$DOMAIN_NAME = "_DOMAINNAME_";
#-------------------------------------------------------------------------------
# EMAIL_SUBJECT - subject of an report for Warden watchdog script
diff --git a/src/warden-server/etc/warden-watchdog.conf.tmpl.update b/src/warden-server/etc/warden-watchdog.conf.tmpl.update
index 4945d43..42d3f54 100644
--- a/src/warden-server/etc/warden-watchdog.conf.tmpl.update
+++ b/src/warden-server/etc/warden-watchdog.conf.tmpl.update
@@ -8,22 +8,22 @@
#-------------------------------------------------------------------------------
# DOMAIN_NAME - server full domain name
#-------------------------------------------------------------------------------
-$DOMAIN_NAME = "_DOMAIN_NAME_";
+$DOMAIN_NAME = "_DOMAINNAME_";
#-------------------------------------------------------------------------------
# EMAIL_SUBJECT - subject of an report for Warden watchdog script
#-------------------------------------------------------------------------------
-$EMAIL_SUBJECT = "_EMAIL_SUBJECT_";
+$EMAIL_SUBJECT = "_EMAILSUBJECT_";
#-------------------------------------------------------------------------------
# EMAIL_SERVER_CONF - path and params of an email server for reports sending
#-------------------------------------------------------------------------------
-$EMAIL_SERVER_CONF = '_EMAIL_SERVER_CONF_';
+$EMAIL_SERVER_CONF = '_EMAILSERVERCONF_';
#-------------------------------------------------------------------------------
# SQL_PRECONDITION - array of procedures which are executed "before" main action
#-------------------------------------------------------------------------------
-@SQL_PRECONDITION = (_SQL_PRECONDITION_);
+@SQL_PRECONDITION = (_SQLPRECONDITION_);
#-------------------------------------------------------------------------------
# SQL_QUERIES - array of hashes of actions for the WardenWatchdog script.
@@ -35,9 +35,9 @@ $EMAIL_SERVER_CONF = '_EMAIL_SERVER_CONF_';
# in a database table.
#-------------------------------------------------------------------------------
@SQL_QUERIES = (
-_SQL_QUERIES_);
+_SQLQUERIES_);
#-------------------------------------------------------------------------------
# SQL_POSTCONDITION - array of procedures which are executed "after" main action
#-------------------------------------------------------------------------------
-@SQL_POSTCONDITION = (_SQL_POSTCONDITION_);
+@SQL_POSTCONDITION = (_SQLPOSTCONDITION_);
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 7175561..8549fc3 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -263,9 +263,9 @@ doTemplate \
# create Apache configuration file
echo -n "Creating Apache configuration file ... "
doTemplate \
- _CERT_FILE_ "$cert_file" \
- _KEY_FILE_ "$key_file" \
- _CA_FILE_ "$ca_file" \
+ _CERTFILE_ "$cert_file" \
+ _KEYFILE_ "$key_file" \
+ _CAFILE_ "$ca_file" \
_LIB_ "$lib" \
< $apache_conf_tmpl \
> $apache_conf && echo "OK" || errClean
@@ -273,7 +273,7 @@ doTemplate \
# create wardenWatchdog configuration file
echo -n "Creating Warden Watchdog configuration file ... "
doTemplate \
- _DOMAIN_NAME_ "$domain_name" \
+ _DOMAINNAME_ "$domain_name" \
_CONTACT_ "$contact" \
< $watchdog_conf_tmpl \
> $watchdog_conf && echo "OK" || errClean
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index a9a5ad8..47b2c09 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -308,14 +308,14 @@ if [[ -r "$server_conf" ]]; then
doTemplate \
_BASEDIR_ "$basedir" \
_SYSLOG_ "$syslog" \
- _SYSLOG_VERBOSE_ "$syslog_verbose" \
- _SYSLOG_FACILITY_ "$syslog_facility" \
- _DB_NAME_ "$db_name" \
- _DB_USER_ "$db_user" \
- _DB_PASS_ "$db_pass" \
- _DB_HOST_ "$db_host" \
- _MAX_EVENTS_LIMIT_ "$max_events_limit" \
- _VALID_STRINGS_ "$valid_strings" \
+ _SYSLOGVERBOSE_ "$syslog_verbose" \
+ _SYSLOGFACILITY_ "$syslog_facility" \
+ _DBNAME_ "$db_name" \
+ _DBUSER_ "$db_user" \
+ _DBPASS_ "$db_pass" \
+ _DBHOST_ "$db_host" \
+ _MAXEVENTSLIMIT_ "$max_events_limit" \
+ _VALIDSTRINGS_ "$valid_strings" \
< $server_conf_tmpl_update \
> $server_conf && echo "OK" || errClean
else
@@ -342,9 +342,9 @@ if [[ -r "$apache_conf" ]]; then
ca_file=${ca_file_tmp##*" "}
lib=${lib_tmp##*" "}
doTemplate \
- _CERT_FILE_ "$cert_file" \
- _KEY_FILE_ "$key_file" \
- _CA_FILE_ "$ca_file" \
+ _CERTFILE_ "$cert_file" \
+ _KEYFILE_ "$key_file" \
+ _CAFILE_ "$ca_file" \
_LIB_ "$lib" \
< $apache_conf_tmpl_update \
> $apache_conf && echo "OK" || errClean
@@ -356,9 +356,9 @@ else
ca_file="unspecified.ca_cert"
lib="unspecified.lib_path"
doTemplate \
- _CERT_FILE_ "$cert_file" \
- _KEY_FILE_ "$key_file" \
- _CA_FILE_ "$ca_file" \
+ _CERTFILE_ "$cert_file" \
+ _KEYFILE_ "$key_file" \
+ _CAFILE_ "$ca_file" \
_LIB_ "$lib" \
< $apache_conf_tmpl \
> $apache_conf && echo "OK" || errClean
@@ -376,12 +376,12 @@ if [[ -r "$watchdog_conf" ]]; then
sql_queries=$(perl -e "use updateCommon; updateCommon::getConfArrayQueries(\"$watchdog_conf\");")
sql_postcondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPost(\"$watchdog_conf\");")
doTemplate \
- _DOMAIN_NAME_ "$domain_name" \
- _EMAIL_SUBJECT_ "$email_subject" \
- _EMAIL_SERVER_CONF_ "$email_server_conf" \
- _SQL_PRECONDITION_ "$sql_precondition" \
- _SQL_QUERIES_ "$sql_queries" \
- _SQL_POSTCONDITION_ "$sql_postcondition" \
+ _DOMAINNAME_ "$domain_name" \
+ _EMAILSUBJECT_ "$email_subject" \
+ _EMAILSERVER_CONF_ "$email_server_conf" \
+ _SQLPRECONDITION_ "$sql_precondition" \
+ _SQLQUERIES_ "$sql_queries" \
+ _SQLPOSTCONDITION_ "$sql_postcondition" \
< $watchdog_conf_tmpl_update \
> $watchdog_conf && echo "OK" || errClean
else
@@ -390,7 +390,7 @@ else
domain_name=$(hostname -f || echo "unspecified.server")
contact="unspecified.contact"
doTemplate \
- _DOMAIN_NAME_ "$domain_name" \
+ _DOMAINNAME_ "$domain_name" \
_CONTACT_ "$contact" \
< $watchdog_conf_tmpl \
> $watchdog_conf && echo "OK" || errClean
--
GitLab