diff --git a/packages/build-server.sh b/packages/build-server.sh index 8170883ecec267057e48c7a6db69c8bc36aa4983..d85b61dae38a0f02d7548087063dab71bc3dd338 100755 --- a/packages/build-server.sh +++ b/packages/build-server.sh @@ -49,7 +49,7 @@ err() #------------------------------------------------------------------------------- # edit when you build new package -version="0.1.0" +version="0.1.1" package_name="warden-server" package="$package_name-$version" @@ -90,6 +90,7 @@ 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/src/warden-server/bin/getWebStatus.sh b/src/warden-server/bin/getWebStatus.sh new file mode 100644 index 0000000000000000000000000000000000000000..8564fc96d7e17ed1a0a11df638e3cf6923e1641e --- /dev/null +++ b/src/warden-server/bin/getWebStatus.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +DB_NAME=`cat /opt/warden-server/etc/warden-server.conf | grep DB_NAME | sed 's/[";]//g' |awk '{print $3}'` +DB_USER=`cat /opt/warden-server/etc/warden-server.conf | grep DB_USER | sed 's/[";]//g' |awk '{print $3}'` +DB_PASS=`cat /opt/warden-server/etc/warden-server.conf | grep DB_PASS | sed 's/[";]//g' |awk '{print $3}'` +DB_HOST=`cat /opt/warden-server/etc/warden-server.conf | grep DB_HOST | sed 's/[";]//g' |awk '{print $3}'` + +echo "SELECT FROM_UNIXTIME( UNIX_TIMESTAMP( received ) - ( UNIX_TIMESTAMP( received ) % ( 60 ) ) ) AS t, COUNT( id ) FROM events GROUP BY t" | mysql -h $DB_HOST -u $DB_USER $DB_NAME +apache2ctl status +echo -n "" +uptime +echo -n klientu: ; netstat -nlpa | grep :443 | grep ESTA |wc -l; +echo -n FIN:; netstat | grep WAIT2 | wc -l + diff --git a/src/warden-server/doc/warden.mysql b/src/warden-server/doc/warden.mysql index 043e76dec7b81f7dd414be2e66a7f568111e5167..8015a38bc13d0423fad8a77f18d94c49a4728f7a 100644 --- a/src/warden-server/doc/warden.mysql +++ b/src/warden-server/doc/warden.mysql @@ -42,7 +42,7 @@ CREATE TABLE `clients` ( `description_tags` varchar(256) default NULL, `ip_net_client` varchar(256) default NULL, PRIMARY KEY (`client_id`) -) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1; +) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; SET character_set_client = @saved_cs_client; -- @@ -69,7 +69,7 @@ CREATE TABLE `events` ( `timeout` int(2) default NULL, `valid` varchar(1) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=31 DEFAULT CHARSET=latin1; +) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; SET character_set_client = @saved_cs_client; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; diff --git a/src/warden-server/etc/warden-apache.conf b/src/warden-server/etc/warden-apache.conf index 77f5d19c989ebfaae1527c9694dd401b009e45dc..74e7aaefdcd0e9f746c1cb14ffe2993c0821470b 100644 --- a/src/warden-server/etc/warden-apache.conf +++ b/src/warden-server/etc/warden-apache.conf @@ -1,3 +1,7 @@ + #DumpIOInput On + #DumpIOOutput On + #DumpIOLogLevel warn + SSLEngine on SSLVerifyDepth 3