diff --git a/packages/build-server.sh b/packages/build-server.sh
index 92576e44afdcbd76a53b86a645e64c62699af31c..1333c515784c39d03d36418e75dddcdb1b963fdf 100755
--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -45,7 +45,6 @@ mkdir -p $package 2> $err || err
cp ../src/${package_name}/sh/install.sh $package 2> $err || err
cp ../src/${package_name}/sh/update.sh $package 2> $err || err
cp ../src/${package_name}/sh/uninstall.sh $package 2> $err || err
-cp ../src/${package_name}/sh/uninstall.sh $package 2> $err || err
cp ../src/${package_name}/doc/AUTHORS $package 2> $err || err
cp ../src/${package_name}/doc/CHANGELOG $package 2> $err || err
cp ../src/${package_name}/doc/INSTALL $package 2> $err || err
@@ -69,7 +68,6 @@ echo "OK"
echo -n "Building '${etc}' directory ... "
mkdir -p $etc 2> $err || err
cp ../src/${package_name}/etc/package_version $etc 2> $err || err
-cp ../src/${package_name}/etc/warden-apache.conf $etc 2> $err || err
echo "OK"
echo -n "Building '${lib}' directory ... "
diff --git a/packages/warden-server-2.1-beta5.tar.gz b/packages/warden-server-2.1-beta5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..29e0b5cc2f7d2c93ecc23598307b5b730f09eed8
Binary files /dev/null and b/packages/warden-server-2.1-beta5.tar.gz differ
diff --git a/packages/warden-server-2.1-beta5.tar.gz.sig b/packages/warden-server-2.1-beta5.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..34e1e59eb2960358829dda6fb1c3c00cceafc918
--- /dev/null
+++ b/packages/warden-server-2.1-beta5.tar.gz.sig
@@ -0,0 +1 @@
+e4e6cd82c07aa02f4a73aa37f5da13e7d04ab0fe warden-server-2.1-beta5.tar.gz
diff --git a/src/meta/README b/src/contrib/meta/README
similarity index 100%
rename from src/meta/README
rename to src/contrib/meta/README
diff --git a/src/meta/other/importMetaClients.sh b/src/contrib/meta/other/importMetaClients.sh
similarity index 100%
rename from src/meta/other/importMetaClients.sh
rename to src/contrib/meta/other/importMetaClients.sh
diff --git a/src/meta/other/meta-nodes b/src/contrib/meta/other/meta-nodes
similarity index 100%
rename from src/meta/other/meta-nodes
rename to src/contrib/meta/other/meta-nodes
diff --git a/src/meta/other/meta_check.sh b/src/contrib/meta/other/meta_check.sh
similarity index 100%
rename from src/meta/other/meta_check.sh
rename to src/contrib/meta/other/meta_check.sh
diff --git a/src/meta/warden-client-meta.tgz b/src/contrib/meta/warden-client-meta.tgz
similarity index 100%
rename from src/meta/warden-client-meta.tgz
rename to src/contrib/meta/warden-client-meta.tgz
diff --git a/src/meta/wardentest-lenny-meta.sh b/src/contrib/meta/wardentest-lenny-meta.sh
similarity index 100%
rename from src/meta/wardentest-lenny-meta.sh
rename to src/contrib/meta/wardentest-lenny-meta.sh
diff --git a/src/meta/wtw-lenny-meta.sh b/src/contrib/meta/wtw-lenny-meta.sh
similarity index 100%
rename from src/meta/wtw-lenny-meta.sh
rename to src/contrib/meta/wtw-lenny-meta.sh
diff --git a/src/warden-server/doc/UNINSTALL b/src/warden-server/doc/UNINSTALL
index ea227b8c395b47377674c2bc777586c78820198d..d9a61e4e012ef7f0040d10026421141c62173c65 100644
--- a/src/warden-server/doc/UNINSTALL
+++ b/src/warden-server/doc/UNINSTALL
@@ -24,13 +24,72 @@ You must be root for running this script.
B. Uninstallation step
----------------------
-1) Uninstall Warden server package (default installation path)
+1) Uninstall Warden server package (example for default installation path)
# /opt/warden-server/uninstall.sh -d /opt
C. Post-uninstallation steps
---------------------------
+----------------------------
- # a2dismod ssl
- # aptitude remove apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
+1) Stop Apache server
+
+ # /etc/init.d/apache2 stop
+
+
+2) Disable of mod_ssl module
+
+ # a2dismod ssl
+
+
+3) 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)
+
+ <VirtualHost *:443>
+ ...
+
+ Include /opt/warden-server/etc/warden-apache.conf
+ </VirtualHost>
+
+
+ b) remove Apache server performance configuration
+
+ # vim /etc/apache2/apache2.conf
+
+ - prefork module settings
+
+ <IfModule mpm_prefork_module>
+ StartServers 2
+ MinSpareServers 4
+ MaxSpareServers 8
+ ServerLimit 700
+ MaxClients 700
+ MaxRequestsPerChild 0
+ </IfModule>
+
+ - connection settings
+
+ Timeout 10
+ KeepAlive Off
+
+
+4) Drop MySQL database
+
+ $ mysql -u <user> -h localhost -p <password>
+ mysql> DROP DATABASE warden;
+ mysql> exit
+
+
+5) Uninstall unnecessary packages (optional)
+
+ # aptitude remove apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
+
+
+6) Start Apache server
+
+ # /etc/init.d/apache2 start
diff --git a/src/warden-server/doc/UPDATE b/src/warden-server/doc/UPDATE
index 6d3c7f87c1e736eee65fe97ebb3a39ab7a3a67e1..c9ce426ac2998573d0a82265d28b5426a277b9fd 100644
--- a/src/warden-server/doc/UPDATE
+++ b/src/warden-server/doc/UPDATE
@@ -35,3 +35,8 @@ C. Post-update steps
1) Update Warden server database
$ mysql -u <user> -h localhost -p <password> < {warden-server_path}/doc/warden20to21.patch
+
+
+2) Restart Apache server
+
+ # /etc/init.d/apache2 restart
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index e67b198687b2e454c6ee93374f37cbfe893deb00..b5631510226b276e61bee317b7bc7f7d66e99977 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -188,7 +188,7 @@ make_server_conf()
#-------------------------------------------------------------------------------
# BASEDIR - base directory of Warden server
#-------------------------------------------------------------------------------
-\$BASEDIR = '${server_path}';
+\$BASEDIR = \"${server_path}\";
#-------------------------------------------------------------------------------
# SYSLOG - enable/disable syslog logging
@@ -203,40 +203,40 @@ make_server_conf()
#-------------------------------------------------------------------------------
# SYSLOG_FACILITY - syslog facility
#-------------------------------------------------------------------------------
-\$SYSLOG_FACILITY = 'local7';
+\$SYSLOG_FACILITY = \"local7\";
#-------------------------------------------------------------------------------
# DB_NAME - MySQL database name of Warden server
#-------------------------------------------------------------------------------
-\$DB_NAME = 'warden';
+\$DB_NAME = \"warden\";
#-------------------------------------------------------------------------------
# DB_USER - MySQL database user of Warden server
#-------------------------------------------------------------------------------
-\$DB_USER = 'warden';
+\$DB_USER = \"warden\";
#-------------------------------------------------------------------------------
# DB_PASS - MySQL database password of Warden server
#-------------------------------------------------------------------------------
-\$DB_PASS = '';
+\$DB_PASS = \"\";
#-------------------------------------------------------------------------------
# DB_HOST - MySQL database host
#-------------------------------------------------------------------------------
-\$DB_HOST = 'localhost';
+\$DB_HOST = \"localhost\";
#-------------------------------------------------------------------------------
# MAX_EVENTS_LIMIT - server limit of maximum number of events that can be
# delivered to one client in one batch
#-------------------------------------------------------------------------------
-\$MAX_EVENTS_LIMIT = '1000000';
+\$MAX_EVENTS_LIMIT = 1000000;
#-------------------------------------------------------------------------------
# VALID_STRINGS - validation hash containing allowed event attributes
#-------------------------------------------------------------------------------
%VALID_STRINGS = (
- 'type' => ['portscan', 'bruteforce', 'probe', 'spam', 'phishing', 'botnet_c_c', 'dos', 'malware', 'copyright', 'webattack', 'test', 'other', '_any_'],
- 'source_type' => ['IP', 'URL', 'Reply-To:']
+ \"type\" => [\"portscan\", \"bruteforce\", \"probe\", \"spam\", \"phishing\", \"botnet_c_c\", \"dos\", \"malware\", \"copyright\", \"webattack\", \"test\", \"other\", \"_any_\"],
+ \"source_type\" => [\"IP\", \"URL\", \"Reply-To:\"]
);" > $server_conf 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
@@ -292,9 +292,6 @@ changeServerPath()
perl -pi -e "s#/opt#${prefix}#" ${bin}/$file
done
- echo "- update server path: $apache_conf"
- perl -pi -e "s#/opt#${prefix}#" $apache_conf
-
echo "- update server path: ${lib}/Warden.pm"
perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm
@@ -355,6 +352,7 @@ server_conf="${etc}/warden-server.conf"
apache_conf="${etc}/warden-apache.conf"
var="${server_path}/var"
lib="${server_path}/lib"
+doc="${server_path}/doc"
err="/tmp/warden-err"
# check if warden-server is installed
@@ -387,23 +385,21 @@ make_apache_conf
#update paths in utilities
changeServerPath
-#update paths in apachefile
-updateCertsPath
-
# crate symlinks from warden server bin directory to /usr/local/bin
create_symlinks
echo
-echo "Please check client configuration file in ${client_conf}!"
-echo "Please check server configuration file in ${server_conf}!"
-echo "Please check Apache configuration file in ${apache_conf}!"
+echo "Please check configuration files:"
+echo " - ${client_conf}"
+echo " - ${server_conf}"
+echo " - ${apache_conf}"
echo
echo "Warden server directory: $server_path"
echo
+echo "Please follow post-installation steps in ${doc}/INSTALL!"
+echo
echo "Installation of $package_version package was SUCCESSFUL!!!"
echo
-echo "Please follow post-installation steps in ${dirname}/doc/INSTALL!"
-
# cleanup section
rm -rf $err
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index 112d420e3a4d86d0f3b2d453d019c32d2570408c..d9bdcbf84fdb8437bcb174dcb98d585acecb80f9 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -54,7 +54,6 @@ err_clean()
do
ln -s ${bin}/$file ${local_bin}/$file # create symlinks to /usr/local/bin
done
- $init start # start server
cat $err
rm -rf $err $backup_dir
echo
@@ -104,13 +103,6 @@ warden_dir_chck()
}
-stop_warden_server()
-{
- echo "Stopping Warden server ... "
- ${init} stop 1>/dev/null 2>&1
-}
-
-
backup()
{
echo -n "Backing-up Warden server directory ... "
@@ -175,11 +167,10 @@ bin="${server_path}/bin"
local_bin="/usr/local/bin"
etc="${server_path}/etc"
doc="${server_path}/doc"
-uninstall_file="/tmp/UNINSTALL"
+uninstall_file="/tmp/UNINSTALL.warden"
old_package_version_file="${etc}/package_version"
err="/tmp/warden-err"
backup_dir="/tmp/warden-backup"
-init="/etc/init.d/apache2"
# obtain version of installed warden-server package
obtain_package_version
@@ -190,9 +181,6 @@ echo "------------------------- Uninstallation process -------------------------
# check if $prefix/warden-server directory exist
warden_dir_chck
-# stop running warden server
-stop_warden_server
-
# make backup of currently installed warden-server package
backup
@@ -202,11 +190,11 @@ delete_symlinks
# do uninstallation
uninstall_warden_server
+echo
+echo "Please follow post-uninstallation steps in $uninstall_file!"
echo
echo "Uninstallation of $package_version package was SUCCESSFUL!"
echo
-echo "Please follow post-uninstallation steps in $uninstall_file!"
-
# cleanup section
rm -rf $err $backup_dir
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 21f0a7fbc102bd59f83dad0e4a8c431b8118783b..bc0810eef19120bd6575d104dca47ed11507c523 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -173,7 +173,7 @@ update_warden_dir()
update_conf_files()
{
- echo "Updating $apache_conf_file ... "
+ echo -n "Updating $apache_conf_file ... "
ssl_certificate_file=`cat $apache_conf_file | grep 'SSLCertificateFile'`
ssl_certificate_key_file=`cat $apache_conf_file | grep 'SSLCertificateKeyFile'`
@@ -203,8 +203,7 @@ $perl_switches
SetHandler perl-script
PerlHandler Warden::ApacheDispatch
SSLOptions +StdEnvVars
-</Location>
-" > $apache_conf_file 2> $err; ret_val=`echo $?`
+</Location>" > $apache_conf_file 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
echo "OK"
@@ -214,7 +213,7 @@ $perl_switches
#-------------------------------------------------------------------------------
- echo "Updating $client_conf_file ... "
+ echo -n "Updating $client_conf_file ... "
uri=`cat $client_conf_file | grep '$URI'`
ssl_key_file=`cat $client_conf_file | grep '$SSL_KEY_FILE'`
@@ -243,8 +242,7 @@ $ssl_cert_file
#-------------------------------------------------------------------------------
# SSL_CA_FILE - path to CA certificate file
#-------------------------------------------------------------------------------
-$ssl_ca_file
-" > $client_conf_file 2> $err; ret_val=`echo $?`
+$ssl_ca_file" > $client_conf_file 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
echo "OK"
@@ -254,7 +252,7 @@ $ssl_ca_file
#-------------------------------------------------------------------------------
- echo "Updating $server_conf_file ... "
+ echo -n "Updating $server_conf_file ... "
basedir=`cat $server_conf_file | grep '$BASEDIR'`
syslog=`cat $server_conf_file | grep '$SYSLOG' | head -n1`
@@ -269,7 +267,7 @@ $ssl_ca_file
if [ -z "$syslog_facility" ]; then
syslog_facility=`cat $server_conf_file | grep '$FACILITY'`
else
- syslog_facility='$SYSLOG_FACILITY = local7;'
+ syslog_facility='$SYSLOG_FACILITY = "local7";'
fi
db_name=`cat $server_conf_file | grep '$DB_NAME'`
db_user=`cat $server_conf_file | grep '$DB_USER'`
@@ -281,9 +279,9 @@ $ssl_ca_file
fi
valid_strings=`cat $server_conf_file | grep -A 3 '%VALID_STRINGS'`
if [ -z "$valid_strings" ]; then
- valid_strings="\%VALID_STRINGS = (
- \'type\' => [\'portscan\', \'bruteforce\', \'probe\', \'spam\', \'phishing\', \'botnet_c_c\', \'dos\', \'malware\', \'copyright\', \'webattack\', \'test\', \'other\'],
- \'source_type\' => [\'IP\', \'URL\', \'Reply-To:\']
+ valid_strings="%VALID_STRINGS = (
+ \"type\" => [\"portscan\", \"bruteforce\", \"probe\", \"spam\", \"phishing\", \"botnet_c_c\", \"dos\", \"malware\", \"copyright\", \"webattack\", \"test\", \"other\"],
+ \"source_type\" => [\"IP\", \"URL\", \"Reply-To:\"]
);"
fi
@@ -340,8 +338,7 @@ $max_events_limit
#-------------------------------------------------------------------------------
# VALID_STRINGS - validation hash containing allowed event attributes
#-------------------------------------------------------------------------------
-$valid_strings
-" > $server_conf_file 2> $err; ret_val=`echo $?`
+$valid_strings" > $server_conf_file 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
echo "OK"
@@ -381,6 +378,7 @@ package_version=`cat ${dirname}/warden-server/etc/package_version`
[[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
server_path="${prefix}/warden-server"
etc="${server_path}/etc"
+doc="${server_path}/doc"
old_package_version_file="${etc}/package_version"
apache_conf_file="${etc}/warden-apache.conf"
client_conf_file="${etc}/warden-client.conf"
@@ -419,13 +417,16 @@ update_warden_dir
update_conf_files
echo
-echo "Please check configuration file in ${conf_file}!"
+echo "Please check updated configuration files:"
+echo " - $apache_conf_file"
+echo " - $server_conf_file"
+echo " - $client_conf_file"
echo
echo "Warden server directory: $server_path"
echo
echo "Update from $old_package_version to $package_version package was SUCCESSFUL!!!"
echo
-echo "Please follow post-update steps in ${dirname}/doc/UPDATE!"
+echo "Please follow post-update steps in ${doc}/UPDATE!"
echo
# cleanup section