syscheck-users Mailing List for syscheck (Page 2)
Host and service monitoring
Brought to you by:
herrvendil,
kinneh
You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(7) |
Nov
(2) |
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(18) |
Jul
(1) |
Aug
|
Sep
|
Oct
(21) |
Nov
(9) |
Dec
(3) |
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ki...@us...> - 2010-10-19 11:49:03
|
Revision: 7918 http://syscheck.svn.sourceforge.net/syscheck/?rev=7918&view=rev Author: kinneh Date: 2010-10-19 11:48:57 +0000 (Tue, 19 Oct 2010) Log Message: ----------- changed crl checks to look at -nextupdate Modified Paths: -------------- trunk/syscheck/lib/cmp_dates.pl Modified: trunk/syscheck/lib/cmp_dates.pl =================================================================== --- trunk/syscheck/lib/cmp_dates.pl 2010-10-19 11:47:24 UTC (rev 7917) +++ trunk/syscheck/lib/cmp_dates.pl 2010-10-19 11:48:57 UTC (rev 7918) @@ -33,6 +33,6 @@ $date2 = Date_SecsSince1970($nmon,$nmday,$nyear,$nhour,$nmin,$nsec); # diff -my $diff=int(($date2 - $date1)/3600); +my $diff=int(($date1 - $date2)/3600); print "$diff\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-19 11:47:31
|
Revision: 7917 http://syscheck.svn.sourceforge.net/syscheck/?rev=7917&view=rev Author: kinneh Date: 2010-10-19 11:47:24 +0000 (Tue, 19 Oct 2010) Log Message: ----------- Close #40 change 905_publish_crl.sh to make sure you get a new CRL before we remove the old one Modified Paths: -------------- trunk/syscheck/config/905.conf trunk/syscheck/config/common.conf trunk/syscheck/lang/905.english trunk/syscheck/related-available/905_publish_crl.sh Modified: trunk/syscheck/config/905.conf =================================================================== --- trunk/syscheck/config/905.conf 2010-10-19 05:36:47 UTC (rev 7916) +++ trunk/syscheck/config/905.conf 2010-10-19 11:47:24 UTC (rev 7917) @@ -1,41 +1,46 @@ # config for 905_publish_crl.sh HOURTHRESHOLD=1 -CRLDIRECTORY=/srv/www/htdocs/crl/ CANAME[0]=MSDomainLogonCA -VERIFY_HOST[0]=localhost -CRLTO_DIR[0]='/srv/www/htdocs/' +REMOTE_HOST[0]=localhost +CRLTO_DIR[0]='/srv/www/htdocs/crl/' +CRL_NAME[0]=MSDomainLogonCA.crl SSHUSER[0]= SSHKEY[0]= CANAME[1]=eSignCA -VERIFY_HOST[1]=localhost -CRLTO_DIR[1]='/srv/www/htdocs/' +REMOTE_HOST[1]=localhost +CRLTO_DIR[1]='/srv/www/htdocs/crl/' +CRL_NAME[1]=eSignCA.crl SSHUSER[1]= SSHKEY[1]= CANAME[2]=ServerCA -CRLTO_DIR[2]='/srv/www/htdocs/' -VERIFY_HOST[2]=localhost +CRLTO_DIR[2]='/srv/www/htdocs/crl/' +REMOTE_HOST[2]=localhost +CRL_NAME[2]=ServerCA.crl SSHUSER[2]= SSHKEY[2]= CANAME[3]=eIDCA -CRLTO_DIR[3]='/srv/www/htdocs/' -VERIFY_HOST[3]=localhost +CRLTO_DIR[3]='/srv/www/htdocs/crl/' +REMOTE_HOST[3]=localhost +CRL_NAME[3]=eIDCA.crl SSHUSER[3]= SSHKEY[3]= CANAME[4]=MachineCertCA -CRLTO_DIR[4]='/srv/www/htdocs/' -VERIFY_HOST[4]=localhost +CRLTO_DIR[4]='/srv/www/htdocs/crl/' +REMOTE_HOST[4]=localhost +CRL_NAME[4]=MachineCertCA.crl SSHUSER[4]= SSHKEY[4]= CANAME[5]=SoftTokenCA -CRLTO_DIR[5]='/srv/www/htdocs/' -VERIFY_HOST[5]=localhost +CRLTO_DIR[5]='/srv/www/htdocs/crl/' +REMOTE_HOST[5]=localhost +CRL_NAME[5]=SoftTokenCA.crl SSHUSER[5]= SSHKEY[5]= Modified: trunk/syscheck/config/common.conf =================================================================== --- trunk/syscheck/config/common.conf 2010-10-19 05:36:47 UTC (rev 7916) +++ trunk/syscheck/config/common.conf 2010-10-19 11:47:24 UTC (rev 7917) @@ -44,6 +44,10 @@ #Path to active jboss config JBOSS_HOME=${JBOSS_HOME:-"/usr/local/jboss"} +if [ "x$TMPDIR" = "x" ] ; then + TMPDIR="/tmp/" +fi + # List indicating CAs to activate, should contain a list of caname and PIN separated by space. # Also used for handling CRLs. CANAME[0]="eIDCA" Modified: trunk/syscheck/lang/905.english =================================================================== --- trunk/syscheck/lang/905.english 2010-10-19 05:36:47 UTC (rev 7916) +++ trunk/syscheck/lang/905.english 2010-10-19 11:47:24 UTC (rev 7917) @@ -1,9 +1,25 @@ -PUBL_DESCR_1="Publish certificate run successfully" -PUBL_DESCR_2="Publish failed (%s) " -PUBL_HELP_2="Check connectivity to the host (%s) " -PUBL_DESCR_3="Publish certificate failed, script called without file" +PUBL_HELP="Script to publish the CRL:s from the CA, supports local and remote publishing by SSH" + +PUBL_DESCR_1="Publish CRL run successfully (%s)" +PUBL_HELP_1="No action needed" + +PUBL_DESCR_2="Publish to remote host failed crl:(%s) host:(%s)" +PUBL_HELP_2="Try manually to run this command and setup ssh-keys and check username" + +PUBL_DESCR_3="Publish CRL failed, can't copy crl to destination %s/%s" +PUBL_HELP_3="Check permissions for the path:s" + PUBL_DESCR_4="File not found" -PUBL_DESCR_5="CRL is not the right size" -PUBL_DESCR_6="Could not get a CRL from ejbca" -PUBL_HELP_6="Check that EJBCA is running" -PUBL_DESCR_7="CRL is outdated %s %s (%s)" +PUBL_HELP_4="Verify the configuration of this script so it reflects the existing CA:s" + +PUBL_DESCR_5="Couldn't stat the file to get the filesize" +PUBL_HELP_5="Probably some problem getting the file/or filerights" + +PUBL_DESCR_6="File size of CRL is 0 (%s)" +PUBL_HELP_6="Probably some problem getting the file/or filerights" + +PUBL_DESCR_7="CRL is outdated %s (%s)" +PUBL_HELP_7="This script cant get a new CRL, check the CA-logs" + +PUBL_DESCR_8="CRL:%s is published to host:%s" +PUBL_HELP_8="no action needed" Modified: trunk/syscheck/related-available/905_publish_crl.sh =================================================================== --- trunk/syscheck/related-available/905_publish_crl.sh 2010-10-19 05:36:47 UTC (rev 7916) +++ trunk/syscheck/related-available/905_publish_crl.sh 2010-10-19 11:47:24 UTC (rev 7917) @@ -1,10 +1,6 @@ #!/bin/bash -# The script fetches a crl from the ca and scp the crl to a webserver. -# Change $HTTPSERVER, $SSHUSER and $SSHSERVER_DIR. Define the crl's and the servers in the end. -# Usage: -# get example.crl # This gets the crl from the CA server. -# put 192.168.10.10 # This sends the crl to the webserver. +# The script fetches a crl from the ca and copies to a local dir or scp the crl to a webserver. # Set SYSCHECK_HOME if not already set. @@ -41,6 +37,7 @@ ERRNO_5=${SCRIPTID}5 ERRNO_6=${SCRIPTID}6 ERRNO_7=${SCRIPTID}7 +ERRNO_8=${SCRIPTID}8 @@ -52,110 +49,110 @@ fi - -if [ ! -d $CRLDIRECTORY ] ; then - mkdir $CRLDIRECTORY -fi - -VERIFYCRLDIRECTORY="/var/tmp/crl-verify" -if [ ! -d $VERIFYCRLDIRECTORY ] ; then - mkdir $VERIFYCRLDIRECTORY -fi - +### get crl ### +### CRLFILE will be overwritten and migth be empty +### soo call me with a temporary file!!! get () { - CRLNAME=$1 - CRLFILE=$2 - rm -f $CRLDIRECTORY/$CRLFILE - cd ${EJBCA_HOME} - printtoscreen "${EJBCA_HOME}/bin/ejbca.sh ca getcrl $CRLNAME $CRLDIRECTORY/$CRLFILE" - ${EJBCA_HOME}/bin/ejbca.sh ca getcrl $CRLNAME $CRLDIRECTORY/$CRLFILE - if [ $? != 0 -o ! -r $CRLDIRECTORY/$CRLFILE ] ; then - printlogmess $ERROR $ERRNO_6 "$PUBL_DESCR_6" $CRLNAME - fi + CRLNAME=$1 + CRLFILE=$2 + cd ${EJBCA_HOME} + printtoscreen "${EJBCA_HOME}/bin/ejbca.sh ca getcrl $CRLNAME $CRLFILE" + ${EJBCA_HOME}/bin/ejbca.sh ca getcrl $CRLNAME "$CRLFILE" + if [ $? != 0 -o ! -r $CRLFILE ] ; then + printlogmess $ERROR $ERRNO_6 "$PUBL_DESCR_6" "$CRLNAME/$CRLFILE" + fi + } + +### put crl ### put () { - CRLHOST=$1 - CRLFILE=$2 - SSHSERVER_DIR=$3 - SSHKEY=$4 - SSHUSER=$5 + REMOTEHOST=$1 + CRLFILE=$2 + REMOTEDIR=$3 + SSHKEY=$4 + SSHUSER=$5 + + $SYSCHECK_HOME/related-enabled/906_ssh-copy-to-remote-machine.sh -s $CRLFILE $REMOTEHOST $REMOTEDIR $SSHUSER $SSHKEY - cd $CRLDIRECTORY - $SYSCHECK_HOME/related-enabled/906_ssh-copy-to-remote-machine.sh -s $CRLFILE $CRLHOST $SSHSERVER_DIR $SSHUSER $SSHKEY - if [ $? != 0 ] ; then - printlogmess $ERROR $ERRNO_2 "$PUBL_DESCR_2" $CRLHOST $CRLNAME - fi + if [ $? = 0 ] ; then + printlogmess $INFO $ERRNO_8 "$PUBL_DESCR_8" $CRLNAME $CRLHOST + else + printlogmess $ERROR $ERRNO_2 "$PUBL_DESCR_2" $CRLNAME $CRLHOST + fi } -### FOR NOW WE DO THIS HERE, next we should use syscheck who does this + +### check crl ### checkcrl () { - CRLHOST=$1 - CRLNAME=$2 - SSHSERVER_DIR=$3 - SSHKEY=$4 - SSHUSER=$5 + CRLFILE=$1 - cd $VERIFYCRLDIRECTORY - rm -f $VERIFYCRLDIRECTORY/$CRLNAME - if [ "x${CRLHOST}" != "xlocalhost" ] ; then - printtoscreen "scp -o ConnectTimeout=10 -i $SSHKEY $SSHUSER@${CRLHOST}:$SSHSERVER_DIR/$CRLNAME $VERIFYCRLDIRECTORY/$CRLNAME " - scp -o ConnectTimeout=10 -i $SSHKEY $SSHUSER@${CRLHOST}:$SSHSERVER_DIR/$CRLNAME $VERIFYCRLDIRECTORY/$CRLNAME - if [ $? -ne 0 ] ; then - printlogmess $ERROR $ERRNO_3 "$PUBL_DESCR_3" $CRLHOST $CRLNAME - exit - fi - else - cp -f $SSHSERVER_DIR/$CRLNAME $VERIFYCRLDIRECTORY/$CRLNAME - fi - # file not found where it should be - if [ ! -f $VERIFYCRLDIRECTORY/$CRLNAME ] ; then - printlogmess $ERROR $ERRNO_4 "$PUBL_DESCR_4" $CRLHOST $CRLNAME - exit 1 - fi + if [ ! -f $CRLFILE ] ; then + printlogmess $ERROR $ERRNO_4 "$PUBL_DESCR_4" $CRLFILE + return 4 + fi - CRL_FILE_SIZE=`stat -c"%s" $VERIFYCRLDIRECTORY/$CRLNAME` # stat return check - if [ $? -ne 0 ] ; then - printlogmess $ERROR $ERRNO_5 "$PUBL_DESCR_5" $CRLHOST $CRLNAME - exit - fi + CRL_FILE_SIZE=`stat -c"%s" $CRLFILE` + if [ $? -ne 0 ] ; then + printlogmess $ERROR $ERRNO_5 "$PUBL_DESCR_5" $CRLFILE + return 5 + fi # crl of 0 size? - if [ "x$CRL_FILE_SIZE" = "x0" ] ; then - printlogmess $ERROR $ERRNO_6 "$PUBL_DESCR_6" $CRLHOST $CRLNAME - exit - fi + if [ "x$CRL_FILE_SIZE" = "x0" ] ; then + printlogmess $ERROR $ERRNO_6 "$PUBL_DESCR_6" $CRLFILE + return 6 + fi # now we can check the crl:s best before date is in the future with atleast HOURTHRESHOLD hours (defined in resources) - TEMPDATE=`openssl crl -inform der -in $CRLNAME -lastupdate -noout` - DATE=${TEMPDATE:11} - HOURSSINCEGENERATION=`${SYSCHECK_HOME}/lib/cmp_dates.pl "$DATE"` - - if [ "$HOURSSINCEGENERATION" -gt "$HOURTHRESHOLD" ] ; then - printlogmess $ERROR $ERRNO_7 "$PUBL_DESCR_7" $CRLNAME $CRLHOST "old: ${HOURSSINCEGENERATION}) limit: ${HOURTHRESHOLD}" - else - printlogmess $INFO $ERRNO_1 "$PUBL_DESCR_1" $CRLHOST $CRLNAME - fi + TEMPDATE=`openssl crl -inform der -in $CRLFILE -nextupdate -noout` + DATE=${TEMPDATE:11} + HOURSLEFT=`${SYSCHECK_HOME}/lib/cmp_dates.pl "$DATE"` + + if [ "$HOURSLEFT" -lt "$HOURTHRESHOLD" ] ; then + printlogmess $ERROR $ERRNO_7 "$PUBL_DESCR_7" $CRLFILE "hoursleft: ${HOURSLEFT} limit: ${HOURTHRESHOLD}" + return 7 + else +# printlogmess $INFO $ERRNO_1 "$PUBL_DESCR_1" $CRLFILE + return 0 + fi } + for (( i=0; i < ${#CANAME[@]} ; i++ )){ - if [ "x${VERIFY_HOST[$i]}" = "xlocalhost" ] ; then - get ${CANAME[$i]} "${CANAME[$i]}.crl" -# todo fix verification date calc problems -# checkcrl ${VERIFY_HOST[$i]} "${CANAME[$i]}.crl" ${CRLTO_DIR[$i]} + tempdir=$(mktemp -d) + trap 'rm -rf "$tempdir"' EXIT + + CRLFILE=${tempdir}/${CRL_NAME[$i]} + + get ${CANAME[$i]} "${CRLFILE}" + checkcrl "${CRLFILE}" + if [ $? -ne 0 ] ; then + # check crl didn't pass the crl so we'll not publish this one and continue with the next + rm -rf $tempdir + continue + fi + + if [ "x${REMOTE_HOST[$i]}" = "xlocalhost" ] ; then + cp -f ${CRLFILE} "${CRLTO_DIR[$i]}/${CRL_NAME[$i]}" + if [ $? -eq 0 ] ;then + printlogmess $INFO $ERRNO_1 "$PUBL_DESCR_1" ${CANAME[$i]} else - get ${CANAME[$i]} "${CANAME[$i]}.crl" - put ${VERIFY_HOST[$i]} "${CANAME[$i]}.crl" ${CRLTO_DIR[$i]} ${SSHKEY[$i]} ${SSHUSER[$i]} - checkcrl ${VERIFY_HOST[$i]} "${CANAME[$i]}.crl" ${CRLTO_DIR[$i]} ${SSHKEY[$i]} ${SSHUSER[$i]} + printlogmess $ERROR $ERRNO_3 "$PUBL_DESCR_3" ${CRL_NAME[$i]} "${CRLTO_DIR[$i]}/${CRL_NAME[$i]}" fi + + else + put ${REMOTE_HOST[$i]} ${CRLFILE} ${CRLTO_DIR[$i]} ${SSHKEY[$i]} ${SSHUSER[$i]} + + fi + rm -rf $tempdir } - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-19 05:36:53
|
Revision: 7916 http://syscheck.svn.sourceforge.net/syscheck/?rev=7916&view=rev Author: kinneh Date: 2010-10-19 05:36:47 +0000 (Tue, 19 Oct 2010) Log Message: ----------- Closes #39 remove the misc/clusterscript path from some 80x scripts Modified Paths: -------------- trunk/syscheck/config/common.conf trunk/syscheck/database-replication/802-create-mysql-ejbca-user-db-user.sh trunk/syscheck/database-replication/803-create-mysql-replication-user.sh trunk/syscheck/database-replication/804-make-mysql-server-act-as-master.sh trunk/syscheck/database-replication/805-make-mysql-server-act-as-slave.sh trunk/syscheck/database-replication/815-create-mysql-ejbca-user-db-user-localhost-only.sh Modified: trunk/syscheck/config/common.conf =================================================================== --- trunk/syscheck/config/common.conf 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/config/common.conf 2010-10-19 05:36:47 UTC (rev 7916) @@ -85,17 +85,6 @@ -### CLUSTER SCRIPT RESOURCES ### -#Depending if the scripts is running as a cluster or standalone -#might different levels with different errorcodes be reported. -#Comment and uncomment the levels you want to change - -#Path do clusterscript directory -CLUSTERSCRIPT_HOME=$SYSCHECK_HOME/misc/clusterscripts - -#Path do ejbcascript directory -EJBCASCRIPT_HOME=$SYSCHECK_HOME/misc/ejbca - # networking path:s IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route Modified: trunk/syscheck/database-replication/802-create-mysql-ejbca-user-db-user.sh =================================================================== --- trunk/syscheck/database-replication/802-create-mysql-ejbca-user-db-user.sh 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/database-replication/802-create-mysql-ejbca-user-db-user.sh 2010-10-19 05:36:47 UTC (rev 7916) @@ -49,7 +49,7 @@ fi -OUTFILE="$CLUSTERSCRIPT_HOME/tmp_create-ejbca-mysql-user.sql" +OUTFILE="$SYSCHECK_HOME/var/tmp_create-ejbca-mysql-user.sql" echo "GRANT ALL ON ejbca.* to '$DB_USER'@'$HOSTNAME_NODE1' IDENTIFIED BY '${DB_PASSWORD}';" > $OUTFILE echo "GRANT ALL ON ejbca.* to '$DB_USER'@'$HOSTNAME_NODE2' IDENTIFIED BY '${DB_PASSWORD}';" >> $OUTFILE Modified: trunk/syscheck/database-replication/803-create-mysql-replication-user.sh =================================================================== --- trunk/syscheck/database-replication/803-create-mysql-replication-user.sh 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/database-replication/803-create-mysql-replication-user.sh 2010-10-19 05:36:47 UTC (rev 7916) @@ -52,7 +52,7 @@ -OUTFILE="$CLUSTERSCRIPT_HOME/tmp_create-ejbca-mysql-user.sql" +OUTFILE="$SYSCHECK_HOME/var/tmp_create-ejbca-mysql-user.sql" echo "GRANT REPLICATION SLAVE ON *.* to '${DBREP_USER}'@'${HOSTNAME_NODE2}' IDENTIFIED BY '${DBREP_PASSWORD}';" > $OUTFILE echo "GRANT REPLICATION SLAVE ON *.* to '${DBREP_USER}'@'${HOSTNAME_VIRTUAL}' IDENTIFIED BY '${DBREP_PASSWORD}';" >> $OUTFILE Modified: trunk/syscheck/database-replication/804-make-mysql-server-act-as-master.sh =================================================================== --- trunk/syscheck/database-replication/804-make-mysql-server-act-as-master.sh 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/database-replication/804-make-mysql-server-act-as-master.sh 2010-10-19 05:36:47 UTC (rev 7916) @@ -60,7 +60,7 @@ fi -OUTFILE="$CLUSTERSCRIPT_HOME/tmp_make-mysql-server-act-as-master.sql" +OUTFILE="$SYSCHECK_HOME/var/tmp_make-mysql-server-act-as-master.sql" echo "SLAVE STOP;" > $OUTFILE echo "RESET MASTER;" >> $OUTFILE Modified: trunk/syscheck/database-replication/805-make-mysql-server-act-as-slave.sh =================================================================== --- trunk/syscheck/database-replication/805-make-mysql-server-act-as-slave.sh 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/database-replication/805-make-mysql-server-act-as-slave.sh 2010-10-19 05:36:47 UTC (rev 7916) @@ -73,7 +73,7 @@ -OUTFILE="$CLUSTERSCRIPT_HOME/tmp_make-mysql-server-act-as-slave.sql" +OUTFILE="$SYSCHECK_HOME/var/tmp_make-mysql-server-act-as-slave.sql" echo "STOP SLAVE;" > $OUTFILE if [ "x$THIS_NODE" = "xNODE1" ] ; then Modified: trunk/syscheck/database-replication/815-create-mysql-ejbca-user-db-user-localhost-only.sh =================================================================== --- trunk/syscheck/database-replication/815-create-mysql-ejbca-user-db-user-localhost-only.sh 2010-10-19 05:29:43 UTC (rev 7915) +++ trunk/syscheck/database-replication/815-create-mysql-ejbca-user-db-user-localhost-only.sh 2010-10-19 05:36:47 UTC (rev 7916) @@ -49,7 +49,7 @@ fi -OUTFILE="$CLUSTERSCRIPT_HOME/tmp_create-ejbca-mysql-user.sql" +OUTFILE="$SYSCHECK_HOME/var/tmp_create-ejbca-mysql-user.sql" echo "GRANT ALL ON ejbca.* to '$DB_USER'@'localhost' IDENTIFIED BY '${DB_PASSWORD}';" > $OUTFILE echo "select * from user where user like '%${DB_USER}%'" >> $OUTFILE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-19 05:29:49
|
Revision: 7915 http://syscheck.svn.sourceforge.net/syscheck/?rev=7915&view=rev Author: kinneh Date: 2010-10-19 05:29:43 +0000 (Tue, 19 Oct 2010) Log Message: ----------- datestamp in filename was wrong, printed month in the minute filed Modified Paths: -------------- trunk/syscheck/related-available/917_archive_file.sh Modified: trunk/syscheck/related-available/917_archive_file.sh =================================================================== --- trunk/syscheck/related-available/917_archive_file.sh 2010-10-14 07:42:40 UTC (rev 7914) +++ trunk/syscheck/related-available/917_archive_file.sh 2010-10-19 05:29:43 UTC (rev 7915) @@ -222,7 +222,7 @@ # get new filenames infile=`basename $file` - datestr=`date +"%Y-%m-%d_%H.%m.%S"` + datestr=`date +"%Y-%m-%d_%H.%M.%S"` ShortFileName="${datestr}_orgname__${infile}__" itFile=`moveToIntransit ${ShortFileName}` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-14 07:37:38
|
Revision: 7913 http://syscheck.svn.sourceforge.net/syscheck/?rev=7913&view=rev Author: kinneh Date: 2010-10-14 07:37:31 +0000 (Thu, 14 Oct 2010) Log Message: ----------- First version for #6 change the help function so it prints the log standard format instead and #3 move level to a define per message instead of each printlogmess chooses the level Also closes #37 add better support for changing the location of syscheck install for sc_300_check_running_procs.sh Added Paths: ----------- trunk/syscheck/config/300.conf trunk/syscheck/lang/300.english trunk/syscheck/scripts-available/sc_300_check_running_procs.sh Removed Paths: ------------- trunk/syscheck/config/30.conf trunk/syscheck/lang/30.english trunk/syscheck/scripts-available/sc_30_check_running_procs.sh Deleted: trunk/syscheck/config/30.conf =================================================================== --- trunk/syscheck/config/30.conf 2010-10-14 06:56:06 UTC (rev 7912) +++ trunk/syscheck/config/30.conf 2010-10-14 07:37:31 UTC (rev 7913) @@ -1,31 +0,0 @@ -# config for sc_30_check_running_procs.sh - -# set RESTARTCMD to empty if no automatic action is wanted - -PROCNAME[0]=apache2 -RESTARTCMD[0]="/etc/init.d/apache2 restart" -PIDFILE[0]=/var/run/apache2.pid - -# -PROCNAME[1]=ntpd -RESTARTCMD[1]="/etc/init.d/ntp restart" -PIDFILE[1]=/var/run/ntpd.pid - -# -PROCNAME[2]=cupsd -RESTARTCMD[2]="/etc/init.d/cups stop ; sleep 3 ; /etc/init.d/cups start" -PIDFILE[2]=/var/run/cups/cupsd.pid - - -#PROCNAME[3]=apache2 -#RESTARTCMD[3]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" -#PIDFILE[3]=/var/run/apache2.pid - - -#PROCNAME[4]=apache2 -#RESTARTCMD[4]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" -#PIDFILE[4]=/var/run/apache2.pid - - - - Copied: trunk/syscheck/config/300.conf (from rev 7902, trunk/syscheck/config/30.conf) =================================================================== --- trunk/syscheck/config/300.conf (rev 0) +++ trunk/syscheck/config/300.conf 2010-10-14 07:37:31 UTC (rev 7913) @@ -0,0 +1,31 @@ +# config for sc_30_check_running_procs.sh + +# set RESTARTCMD to empty if no automatic action is wanted + +PROCNAME[0]=apache2 +RESTARTCMD[0]="/etc/init.d/apache2 restart" +PIDFILE[0]=/var/run/apache2.pid + +# +PROCNAME[1]=ntpd +RESTARTCMD[1]="/etc/init.d/ntp restart" +PIDFILE[1]=/var/run/ntpd.pid + +# +PROCNAME[2]=cupsd +RESTARTCMD[2]="/etc/init.d/cups stop ; sleep 3 ; /etc/init.d/cups start" +PIDFILE[2]=/var/run/cups/cupsd.pid + + +#PROCNAME[3]=apache2 +#RESTARTCMD[3]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" +#PIDFILE[3]=/var/run/apache2.pid + + +#PROCNAME[4]=apache2 +#RESTARTCMD[4]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" +#PIDFILE[4]=/var/run/apache2.pid + + + + Property changes on: trunk/syscheck/config/300.conf ___________________________________________________________________ Added: svn:mergeinfo + Deleted: trunk/syscheck/lang/30.english =================================================================== --- trunk/syscheck/lang/30.english 2010-10-14 06:56:06 UTC (rev 7912) +++ trunk/syscheck/lang/30.english 2010-10-14 07:37:31 UTC (rev 7913) @@ -1,9 +0,0 @@ -HELP="Generic script to check a proc is running and try to restart those that's not" -DESCR_1="Process %s is running" -HELP_1="No action is needed" -DESCR_2="Process %s was not running, restart succeded" -HELP_2="If this happens regulary this need to be looked into" -DESCR_3="Process %s was not running, restart succeded" -HELP_3="If this happens regulary this need to be looked into" -DESCR_4="Process %s was not running, no restart command defined" -HELP_4="No restart command defined, restart manually" Copied: trunk/syscheck/lang/300.english (from rev 7902, trunk/syscheck/lang/30.english) =================================================================== --- trunk/syscheck/lang/300.english (rev 0) +++ trunk/syscheck/lang/300.english 2010-10-14 07:37:31 UTC (rev 7913) @@ -0,0 +1,20 @@ +ABOUT="Generic script to check a proc is running and try to restart those that's not" +DESCR[0]="Process %s is running" +HELP[0]="No action is needed" +LEVEL[0]=$INFO +ERRNO[0]=${SCRIPTID}0 + +DESCR[1]="Process %s was not running, restart succeded" +HELP[1]="If this happens regulary this need to be looked into" +LEVEL[1]=$WARN +ERRNO[1]=${SCRIPTID}1 + +DESCR[2]="Process %s was not running, restart failed" +HELP[2]="If this needs to be this handled manually" +LEVEL[2]=$ERROR +ERRNO[2]=${SCRIPTID}2 + +DESCR[3]="Process %s was not running, no restart command defined" +HELP[3]="No restart command defined, restart manually" +LEVEL[3]=$ERROR +ERRNO[3]=${SCRIPTID}3 Property changes on: trunk/syscheck/lang/300.english ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/syscheck/scripts-available/sc_300_check_running_procs.sh (from rev 7902, trunk/syscheck/scripts-available/sc_30_check_running_procs.sh) =================================================================== --- trunk/syscheck/scripts-available/sc_300_check_running_procs.sh (rev 0) +++ trunk/syscheck/scripts-available/sc_300_check_running_procs.sh 2010-10-14 07:37:31 UTC (rev 7913) @@ -0,0 +1,68 @@ +#!/bin/sh + +# Set SYSCHECK_HOME if not already set. + +# 1. First check if SYSCHECK_HOME is set then use that +if [ "x${SYSCHECK_HOME}" = "x" ] ; then +# 2. Check if /etc/syscheck.conf exists then source that (put SYSCHECK_HOME=/path/to/syscheck in ther) + if [ -e /etc/syscheck.conf ] ; then + source /etc/syscheck.conf + else +# 3. last resort use default path + SYSCHECK_HOME="/usr/local/syscheck" + fi +fi + +if [ ! -f ${SYSCHECK_HOME}/syscheck.sh ] ; then echo "$0: Can't find syscheck.sh in SYSCHECK_HOME ($SYSCHECK_HOME)" ;exit ; fi + + + + +# uniq ID of script (please use in the name of this file also for convinice for finding next availavle number) +SCRIPTID=300 + +## Import common definitions ## +. $SYSCHECK_HOME/config/syscheck-scripts.conf + +getlangfiles $SCRIPTID +getconfig $SCRIPTID + + +# help +if [ "x$1" = "x--help" ] ; then + displayhelp + exit +elif [ "x$1" = "x-s" -o "x$1" = "x--screen" ] ; then + PRINTTOSCREEN=1 +fi + + +for (( i = 0 ; i < ${#PROCNAME[@]} ; i++ )) ; do + + pidinfo=`${SYSCHECK_HOME}/lib/proc_checker.sh ${PIDFILE[$i]} ${PROCNAME[$i]}` + if [ "x$pidinfo" = "x" ] ; then + + # try restart + if [ "x${RESTARTCMD[$i]}" = "x" ] ; then + # no restart cmd defined + printlogmess ${LEVEL[3]} ${ERRNO[3]} "${DESCR[3]}" ${PROCNAME[$i]} + continue + fi + + eval ${RESTARTCMD[$i]} + + if [ $? -eq 0 ] ; then + # log restart success + printlogmess ${LEVEL[1]} ${ERRNO[1]} "${DESCR[1]}" ${PROCNAME[$i]} + else + # log restart fail + printlogmess ${LEVEL[2]} ${ERRNO[2]} "${DESCR[2]}" ${PROCNAME[$i]} + fi + else + printlogmess ${LEVEL[0]} ${ERRNO[0]} "${DESCR[0]}" ${PROCNAME[$i]} + printtoscreen "proc $i: ${PROCNAME[$i]} is running" + fi + + +done + Property changes on: trunk/syscheck/scripts-available/sc_300_check_running_procs.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:mergeinfo + Deleted: trunk/syscheck/scripts-available/sc_30_check_running_procs.sh =================================================================== --- trunk/syscheck/scripts-available/sc_30_check_running_procs.sh 2010-10-14 06:56:06 UTC (rev 7912) +++ trunk/syscheck/scripts-available/sc_30_check_running_procs.sh 2010-10-14 07:37:31 UTC (rev 7913) @@ -1,60 +0,0 @@ -#!/bin/sh - -# Set default home if not already set. -SYSCHECK_HOME=${SYSCHECK_HOME:-"/usr/local/syscheck"} - -# uniq ID of script (please use in the name of this file also for convinice for finding next availavle number) -SCRIPTID=30 - -## Import common definitions ## -. $SYSCHECK_HOME/config/syscheck-scripts.conf - -getlangfiles $SCRIPTID -getconfig $SCRIPTID - -ERRNO_1=${SCRIPTID}01 -ERRNO_2=${SCRIPTID}02 -ERRNO_3=${SCRIPTID}03 -ERRNO_4=${SCRIPTID}04 - - -# help -if [ "x$1" = "x--help" ] ; then - echo "$0 $HELP" - echo "$ERRNO_1/$DESCR_1 - $HELP_1" - echo "$ERRNO_2/$DESCR_2 - $HELP_2" - echo "$ERRNO_3/$DESCR_3 - $HELP_3" - echo "$ERRNO_4/$DESCR_4 - $HELP_4" - exit -elif [ "x$1" = "x-s" -o "x$1" = "x--screen" ] ; then - PRINTTOSCREEN=1 -fi - - -for (( i = 0 ; i < ${#PROCNAME[@]} ; i++ )) ; do - - pidinfo=`${SYSCHECK_HOME}/lib/proc_checker.sh ${PIDFILE[$i]} ${PROCNAME[$i]}` - if [ "x$pidinfo" = "x" ] ; then - - # try restart - if [ "x${RESTARTCMD[$i]}" = "x" ] ; then - printlogmess $ERROR $ERRNO_4 "$DESCR_4" ${PROCNAME[$i]} - continue - fi - - eval ${RESTARTCMD[$i]} - - if [ $? -ne 0 ] ; then - # log restart success - printlogmess $INFO $ERRNO_1 "$DESCR_1" ${PROCNAME[$i]} - else - # log restart fail - printlogmess $ERROR $ERRNO_3 "$DESCR_2" ${PROCNAME[$i]} - fi - else - printtoscreen "proc $i: ${PROCNAME[$i]} is running, no action needed" - fi - - -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-14 06:56:12
|
Revision: 7912 http://syscheck.svn.sourceforge.net/syscheck/?rev=7912&view=rev Author: kinneh Date: 2010-10-14 06:56:06 +0000 (Thu, 14 Oct 2010) Log Message: ----------- remove unused file Removed Paths: ------------- trunk/syscheck/.project Deleted: trunk/syscheck/.project =================================================================== --- trunk/syscheck/.project 2010-10-14 06:54:09 UTC (rev 7911) +++ trunk/syscheck/.project 2010-10-14 06:56:06 UTC (rev 7912) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>syscheck</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-14 06:54:16
|
Revision: 7911 http://syscheck.svn.sourceforge.net/syscheck/?rev=7911&view=rev Author: kinneh Date: 2010-10-14 06:54:09 +0000 (Thu, 14 Oct 2010) Log Message: ----------- remove old clusterscritps Removed Paths: ------------- trunk/syscheck/misc/clusterscripts/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-12 12:39:55
|
Revision: 7910 http://syscheck.svn.sourceforge.net/syscheck/?rev=7910&view=rev Author: kinneh Date: 2010-10-12 12:39:49 +0000 (Tue, 12 Oct 2010) Log Message: ----------- Closes #35 change 908 clean old backups to honor the KEEPDAYS for each configued value instead of using default Modified Paths: -------------- trunk/syscheck/config/908.conf trunk/syscheck/related-available/908_clean_old_backups.sh Modified: trunk/syscheck/config/908.conf =================================================================== --- trunk/syscheck/config/908.conf 2010-10-12 12:31:51 UTC (rev 7909) +++ trunk/syscheck/config/908.conf 2010-10-12 12:39:49 UTC (rev 7910) @@ -7,19 +7,19 @@ KEEPDAYS[1]=30; BACKUPDIR[1]="/backup/mysql/daily"; -DATESTR[1]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[0]} 2>/dev/null`; -FILENAME[1]="${BACKUPDIR[0]}/ejbcabackup-${DATESTR[0]}*" +DATESTR[1]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; +FILENAME[1]="${BACKUPDIR[1]}/ejbcabackup-${DATESTR[1]}*" KEEPDAYS[2]=90; BACKUPDIR[2]="/backup/mysql/weekly/"; -DATESTR[2]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; -FILENAME[2]="${BACKUPDIR[1]}/ejbcabackup-${DATESTR[1]}*" +DATESTR[2]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[2]} 2>/dev/null`; +FILENAME[2]="${BACKUPDIR[2]}/ejbcabackup-${DATESTR[2]}*" KEEPDAYS[3]=370; BACKUPDIR[3]="/backup/mysql/monthly/"; -DATESTR[3]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; -FILENAME[3]="${BACKUPDIR[1]}/ejbcabackup-${DATESTR[1]}*" +DATESTR[3]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[3]} 2>/dev/null`; +FILENAME[3]="${BACKUPDIR[3]}/ejbcabackup-${DATESTR[3]}*" ### end config ### Modified: trunk/syscheck/related-available/908_clean_old_backups.sh =================================================================== --- trunk/syscheck/related-available/908_clean_old_backups.sh 2010-10-12 12:31:51 UTC (rev 7909) +++ trunk/syscheck/related-available/908_clean_old_backups.sh 2010-10-12 12:39:49 UTC (rev 7910) @@ -50,7 +50,7 @@ exit fi - realfiles=$(ls ${FILENAME[$i]}) + realfiles=$(ls ${FILENAME[$i]} 2>/dev/null) if [ "x${realfiles}" != "x" ] ; then returnstr=`rm ${FILENAME[$i]} 2>&1` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-12 12:31:57
|
Revision: 7909 http://syscheck.svn.sourceforge.net/syscheck/?rev=7909&view=rev Author: kinneh Date: 2010-10-12 12:31:51 +0000 (Tue, 12 Oct 2010) Log Message: ----------- Closes #36 add backup configuration documentation Added Paths: ----------- trunk/syscheck/doc/syscheck-backup-management.odt trunk/syscheck/doc/syscheck-backup-management.pdf Added: trunk/syscheck/doc/syscheck-backup-management.odt =================================================================== (Binary files differ) Property changes on: trunk/syscheck/doc/syscheck-backup-management.odt ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/syscheck/doc/syscheck-backup-management.pdf =================================================================== (Binary files differ) Property changes on: trunk/syscheck/doc/syscheck-backup-management.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-12 12:30:24
|
Revision: 7908 http://syscheck.svn.sourceforge.net/syscheck/?rev=7908&view=rev Author: kinneh Date: 2010-10-12 12:30:17 +0000 (Tue, 12 Oct 2010) Log Message: ----------- Closes #16 sc_01_discusage config Modified Paths: -------------- trunk/syscheck/config/01.conf trunk/syscheck/lang/01.english trunk/syscheck/scripts-available/sc_01_diskusage.sh Modified: trunk/syscheck/config/01.conf =================================================================== --- trunk/syscheck/config/01.conf 2010-10-07 08:52:11 UTC (rev 7907) +++ trunk/syscheck/config/01.conf 2010-10-12 12:30:17 UTC (rev 7908) @@ -1,2 +1,12 @@ # config for sc_01_diskusage.sh -DU_PERCENT=95 + +FILESYSTEM[0]=/ +USAGEPERCENT[0]=95 + +FILESYSTEM[1]=/usr/local/certificate-services +USAGEPERCENT[1]=90 + +FILESYSTEM[2]=/backup +USAGEPERCENT[2]=80 + + Modified: trunk/syscheck/lang/01.english =================================================================== --- trunk/syscheck/lang/01.english 2010-10-07 08:52:11 UTC (rev 7907) +++ trunk/syscheck/lang/01.english 2010-10-12 12:30:17 UTC (rev 7908) @@ -3,3 +3,5 @@ DU_HELP_1="No action is needed" DU_DESCR_2="Diskusage exceeded (%s is %s percent used: Limit is %s percent)" DU_HELP_2="The usage is more than the limit, if the disk fills up thing will start to break, make some free space and maybe restart the machine" +DU_DESCR_3="Diskusage problems (%s)" +DU_HELP_3="Manually check config and also try df -Ph /path" Modified: trunk/syscheck/scripts-available/sc_01_diskusage.sh =================================================================== --- trunk/syscheck/scripts-available/sc_01_diskusage.sh 2010-10-07 08:52:11 UTC (rev 7907) +++ trunk/syscheck/scripts-available/sc_01_diskusage.sh 2010-10-12 12:30:17 UTC (rev 7908) @@ -15,9 +15,11 @@ ERRNO_1="${SCRIPTID}01" ERRNO_2="${SCRIPTID}02" +ERRNO_3="${SCRIPTID}03" DESCR_1="${DU_DESCR_1}" DESCR_2="${DU_DESCR_2}" +DESCR_3="${DU_DESCR_3}" ### local conf ### @@ -36,14 +38,23 @@ diskusage () { FILESYSTEM=$1 LIMIT=$2 - PERCENT=`df -Ph $FILESYSTEM | grep -v Filesystem | awk '{print $5}' | sed 's/%//'` + DFPH=`df -Ph $FILESYSTEM 2>&1` - if [ $PERCENT -gt $LIMIT ] ; then - printlogmess $ERROR $ERRNO_2 "$DESCR_2" "$FILESYSTEM" "$PERCENT" "$LIMIT" + if [ $? -ne 0 ] ; then + printlogmess $ERROR $ERRNO_3 "$DESCR_3" "$FILESYSTEM" "$DFPH" else - printlogmess $INFO $ERRNO_1 "$DESCR_1" "$FILESYSTEM" "$PERCENT" "$LIMIT" + + PERCENT=`df -Ph $FILESYSTEM | grep -v Filesystem| awk '{print $5}' | sed 's/%//'` + if [ $PERCENT -gt $LIMIT ] ; then + printlogmess $ERROR $ERRNO_2 "$DESCR_2" "$FILESYSTEM" "$PERCENT" "$LIMIT" + else + printlogmess $INFO $ERRNO_1 "$DESCR_1" "$FILESYSTEM" "$PERCENT" "$LIMIT" + fi fi } -diskusage / $DU_PERCENT +for (( i = 0 ; i < ${#FILESYSTEM[@]} ; i++ )) ; do + diskusage ${FILESYSTEM[$i]} ${USAGEPERCENT[$i]} +done + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-07 08:46:23
|
Revision: 7906 http://syscheck.svn.sourceforge.net/syscheck/?rev=7906&view=rev Author: kinneh Date: 2010-10-07 08:46:16 +0000 (Thu, 07 Oct 2010) Log Message: ----------- closes #32 add the new CA:s to crl publish Modified Paths: -------------- trunk/syscheck/config/905.conf Modified: trunk/syscheck/config/905.conf =================================================================== --- trunk/syscheck/config/905.conf 2010-10-07 08:32:49 UTC (rev 7905) +++ trunk/syscheck/config/905.conf 2010-10-07 08:46:16 UTC (rev 7906) @@ -27,4 +27,16 @@ SSHUSER[3]= SSHKEY[3]= +CANAME[4]=MachineCertCA +CRLTO_DIR[4]='/srv/www/htdocs/' +VERIFY_HOST[4]=localhost +SSHUSER[4]= +SSHKEY[4]= + +CANAME[5]=SoftTokenCA +CRLTO_DIR[5]='/srv/www/htdocs/' +VERIFY_HOST[5]=localhost +SSHUSER[5]= +SSHKEY[5]= + ### end config ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-07 08:32:55
|
Revision: 7905 http://syscheck.svn.sourceforge.net/syscheck/?rev=7905&view=rev Author: kinneh Date: 2010-10-07 08:32:49 +0000 (Thu, 07 Oct 2010) Log Message: ----------- closes #33 change path to the certificate-services to find the jboss serv.log Modified Paths: -------------- trunk/syscheck/config/20.conf Modified: trunk/syscheck/config/20.conf =================================================================== --- trunk/syscheck/config/20.conf 2010-10-07 08:30:36 UTC (rev 7904) +++ trunk/syscheck/config/20.conf 2010-10-07 08:32:49 UTC (rev 7905) @@ -1,7 +1,7 @@ #config sc_20_errors_ejbcalog.sh # Ejbca Error Logger, reports error from server.log once -EEL_SERVER_LOG_FILE="/usr/local/jboss/server/default/log/server.log" -EEL_SERVER_LOG_LASTPOSITION="/tmp/usr_local_jboss_server_default_log_server.log.lastposision" +EEL_SERVER_LOG_FILE="/usr/local/certificate-services/jboss/server/default/log/server.log" +EEL_SERVER_LOG_LASTPOSITION="/tmp/usr_local_certificate-services_jboss_server_default_log_server.log.lastposision" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-07 08:30:43
|
Revision: 7904 http://syscheck.svn.sourceforge.net/syscheck/?rev=7904&view=rev Author: kinneh Date: 2010-10-07 08:30:36 +0000 (Thu, 07 Oct 2010) Log Message: ----------- closes #34 better default/sample config of clean backups Modified Paths: -------------- trunk/syscheck/config/908.conf Modified: trunk/syscheck/config/908.conf =================================================================== --- trunk/syscheck/config/908.conf 2010-10-07 08:29:51 UTC (rev 7903) +++ trunk/syscheck/config/908.conf 2010-10-07 08:30:36 UTC (rev 7904) @@ -1,15 +1,25 @@ ### config for 908_clean_old_backups.sh -KEEPDAYS[0]=3; -BACKUPDIR[0]="/var/backup/ejbca_db"; +KEEPDAYS[0]=10; +BACKUPDIR[0]="/backup/mysql/default/"; DATESTR[0]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[0]} 2>/dev/null`; FILENAME[0]="${BACKUPDIR[0]}/ejbcabackup-${DATESTR[0]}*" +KEEPDAYS[1]=30; +BACKUPDIR[1]="/backup/mysql/daily"; +DATESTR[1]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[0]} 2>/dev/null`; +FILENAME[1]="${BACKUPDIR[0]}/ejbcabackup-${DATESTR[0]}*" -KEEPDAYS[1]=15; -BACKUPDIR[1]="/var/backup/hsmbackup"; -DATESTR[1]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; -FILENAME[1]="${BACKUPDIR[1]}/hsmbackup-${DATESTR[1]}*" +KEEPDAYS[2]=90; +BACKUPDIR[2]="/backup/mysql/weekly/"; +DATESTR[2]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; +FILENAME[2]="${BACKUPDIR[1]}/ejbcabackup-${DATESTR[1]}*" +KEEPDAYS[3]=370; +BACKUPDIR[3]="/backup/mysql/monthly/"; +DATESTR[3]=`${SYSCHECK_HOME}/lib/x-days-ago-datestring.pl ${KEEPDAYS[1]} 2>/dev/null`; +FILENAME[3]="${BACKUPDIR[1]}/ejbcabackup-${DATESTR[1]}*" + + ### end config ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-07 08:29:57
|
Revision: 7903 http://syscheck.svn.sourceforge.net/syscheck/?rev=7903&view=rev Author: kinneh Date: 2010-10-07 08:29:51 +0000 (Thu, 07 Oct 2010) Log Message: ----------- adjust the message Modified Paths: -------------- trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh Modified: trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh =================================================================== --- trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh 2010-10-06 18:42:34 UTC (rev 7902) +++ trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh 2010-10-07 08:29:51 UTC (rev 7903) @@ -41,7 +41,7 @@ echo "are you really sure you want to drop and replace the ejbca db on this host?" -echo "enter 'im-really-sure' without the '-' to continue or ctrl-c to abort" +echo "enter 'im-really-sure' to continiue or ctrl-c to abort" read a if [ "x$a" != "xim really sure" ] ; then echo "ok probably wise choice, exiting" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-06 18:42:41
|
Revision: 7902 http://syscheck.svn.sourceforge.net/syscheck/?rev=7902&view=rev Author: kinneh Date: 2010-10-06 18:42:34 +0000 (Wed, 06 Oct 2010) Log Message: ----------- Closes #31 add generic process check Added Paths: ----------- trunk/syscheck/config/30.conf trunk/syscheck/lang/30.english trunk/syscheck/scripts-available/sc_30_check_running_procs.sh Added: trunk/syscheck/config/30.conf =================================================================== --- trunk/syscheck/config/30.conf (rev 0) +++ trunk/syscheck/config/30.conf 2010-10-06 18:42:34 UTC (rev 7902) @@ -0,0 +1,31 @@ +# config for sc_30_check_running_procs.sh + +# set RESTARTCMD to empty if no automatic action is wanted + +PROCNAME[0]=apache2 +RESTARTCMD[0]="/etc/init.d/apache2 restart" +PIDFILE[0]=/var/run/apache2.pid + +# +PROCNAME[1]=ntpd +RESTARTCMD[1]="/etc/init.d/ntp restart" +PIDFILE[1]=/var/run/ntpd.pid + +# +PROCNAME[2]=cupsd +RESTARTCMD[2]="/etc/init.d/cups stop ; sleep 3 ; /etc/init.d/cups start" +PIDFILE[2]=/var/run/cups/cupsd.pid + + +#PROCNAME[3]=apache2 +#RESTARTCMD[3]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" +#PIDFILE[3]=/var/run/apache2.pid + + +#PROCNAME[4]=apache2 +#RESTARTCMD[4]="/etc/init.d/apache2 stop ; sleep 3 ; /etc/init.d/apache2 start" +#PIDFILE[4]=/var/run/apache2.pid + + + + Added: trunk/syscheck/lang/30.english =================================================================== --- trunk/syscheck/lang/30.english (rev 0) +++ trunk/syscheck/lang/30.english 2010-10-06 18:42:34 UTC (rev 7902) @@ -0,0 +1,9 @@ +HELP="Generic script to check a proc is running and try to restart those that's not" +DESCR_1="Process %s is running" +HELP_1="No action is needed" +DESCR_2="Process %s was not running, restart succeded" +HELP_2="If this happens regulary this need to be looked into" +DESCR_3="Process %s was not running, restart succeded" +HELP_3="If this happens regulary this need to be looked into" +DESCR_4="Process %s was not running, no restart command defined" +HELP_4="No restart command defined, restart manually" Added: trunk/syscheck/scripts-available/sc_30_check_running_procs.sh =================================================================== --- trunk/syscheck/scripts-available/sc_30_check_running_procs.sh (rev 0) +++ trunk/syscheck/scripts-available/sc_30_check_running_procs.sh 2010-10-06 18:42:34 UTC (rev 7902) @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set default home if not already set. +SYSCHECK_HOME=${SYSCHECK_HOME:-"/usr/local/syscheck"} + +# uniq ID of script (please use in the name of this file also for convinice for finding next availavle number) +SCRIPTID=30 + +## Import common definitions ## +. $SYSCHECK_HOME/config/syscheck-scripts.conf + +getlangfiles $SCRIPTID +getconfig $SCRIPTID + +ERRNO_1=${SCRIPTID}01 +ERRNO_2=${SCRIPTID}02 +ERRNO_3=${SCRIPTID}03 +ERRNO_4=${SCRIPTID}04 + + +# help +if [ "x$1" = "x--help" ] ; then + echo "$0 $HELP" + echo "$ERRNO_1/$DESCR_1 - $HELP_1" + echo "$ERRNO_2/$DESCR_2 - $HELP_2" + echo "$ERRNO_3/$DESCR_3 - $HELP_3" + echo "$ERRNO_4/$DESCR_4 - $HELP_4" + exit +elif [ "x$1" = "x-s" -o "x$1" = "x--screen" ] ; then + PRINTTOSCREEN=1 +fi + + +for (( i = 0 ; i < ${#PROCNAME[@]} ; i++ )) ; do + + pidinfo=`${SYSCHECK_HOME}/lib/proc_checker.sh ${PIDFILE[$i]} ${PROCNAME[$i]}` + if [ "x$pidinfo" = "x" ] ; then + + # try restart + if [ "x${RESTARTCMD[$i]}" = "x" ] ; then + printlogmess $ERROR $ERRNO_4 "$DESCR_4" ${PROCNAME[$i]} + continue + fi + + eval ${RESTARTCMD[$i]} + + if [ $? -ne 0 ] ; then + # log restart success + printlogmess $INFO $ERRNO_1 "$DESCR_1" ${PROCNAME[$i]} + else + # log restart fail + printlogmess $ERROR $ERRNO_3 "$DESCR_2" ${PROCNAME[$i]} + fi + else + printtoscreen "proc $i: ${PROCNAME[$i]} is running, no action needed" + fi + + +done + Property changes on: trunk/syscheck/scripts-available/sc_30_check_running_procs.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-07-12 07:46:15
|
Revision: 7901 http://syscheck.svn.sourceforge.net/syscheck/?rev=7901&view=rev Author: kinneh Date: 2010-07-12 07:46:09 +0000 (Mon, 12 Jul 2010) Log Message: ----------- remove file from scripts-enabled Removed Paths: ------------- trunk/syscheck/related-enabled/923-rsync-to-remote-machine.sh Deleted: trunk/syscheck/related-enabled/923-rsync-to-remote-machine.sh =================================================================== --- trunk/syscheck/related-enabled/923-rsync-to-remote-machine.sh 2010-06-17 11:35:43 UTC (rev 7900) +++ trunk/syscheck/related-enabled/923-rsync-to-remote-machine.sh 2010-07-12 07:46:09 UTC (rev 7901) @@ -1 +0,0 @@ -link ../related-available/923-rsync-to-remote-machine.sh \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-17 10:25:34
|
Revision: 7899 http://syscheck.svn.sourceforge.net/syscheck/?rev=7899&view=rev Author: kinneh Date: 2010-06-17 10:25:25 +0000 (Thu, 17 Jun 2010) Log Message: ----------- more updates Modified Paths: -------------- trunk/syscheck/doc/database_replication_and_failover.odt Modified: trunk/syscheck/doc/database_replication_and_failover.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-17 09:58:24
|
Revision: 7898 http://syscheck.svn.sourceforge.net/syscheck/?rev=7898&view=rev Author: kinneh Date: 2010-06-17 09:58:17 +0000 (Thu, 17 Jun 2010) Log Message: ----------- replication instruction updated Modified Paths: -------------- trunk/syscheck/doc/database_replication_and_failover.odt Modified: trunk/syscheck/doc/database_replication_and_failover.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-17 08:01:17
|
Revision: 7897 http://syscheck.svn.sourceforge.net/syscheck/?rev=7897&view=rev Author: kinneh Date: 2010-06-17 08:01:08 +0000 (Thu, 17 Jun 2010) Log Message: ----------- updates Modified Paths: -------------- trunk/syscheck/doc/database_replication_and_failover.odt Modified: trunk/syscheck/doc/database_replication_and_failover.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-14 09:02:41
|
Revision: 7896 http://syscheck.svn.sourceforge.net/syscheck/?rev=7896&view=rev Author: kinneh Date: 2010-06-14 09:02:34 +0000 (Mon, 14 Jun 2010) Log Message: ----------- update database doc Modified Paths: -------------- trunk/syscheck/doc/database_replication_and_failover.odt Modified: trunk/syscheck/doc/database_replication_and_failover.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-14 08:31:25
|
Revision: 7895 http://syscheck.svn.sourceforge.net/syscheck/?rev=7895&view=rev Author: kinneh Date: 2010-06-14 08:31:18 +0000 (Mon, 14 Jun 2010) Log Message: ----------- updates to doc and change to common.conf Modified Paths: -------------- trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh trunk/syscheck/doc/database_replication_and_failover.odt trunk/syscheck/lib/release.sh Modified: trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh =================================================================== --- trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh 2010-06-09 10:39:47 UTC (rev 7894) +++ trunk/syscheck/database-replication/801-drop-existing-ejbca-db.sh 2010-06-14 08:31:18 UTC (rev 7895) @@ -41,7 +41,7 @@ echo "are you really sure you want to drop and replace the ejbca db on this host?" -echo "enter 'im-really-sure' to continiue or ctrl-c to abort" +echo "enter 'im-really-sure' without the '-' to continue or ctrl-c to abort" read a if [ "x$a" != "xim really sure" ] ; then echo "ok probably wise choice, exiting" Modified: trunk/syscheck/doc/database_replication_and_failover.odt =================================================================== (Binary files differ) Modified: trunk/syscheck/lib/release.sh =================================================================== --- trunk/syscheck/lib/release.sh 2010-06-09 10:39:47 UTC (rev 7894) +++ trunk/syscheck/lib/release.sh 2010-06-14 08:31:18 UTC (rev 7895) @@ -22,7 +22,7 @@ svn export . ${PROGPATH} -perl -pi -e "s/SYSCHECK_VERSION=.*/SYSCHECK_VERSION=${rel}/gi" ${PROGPATH}/resources.sh +perl -pi -e "s/SYSCHECK_VERSION=.*/SYSCHECK_VERSION=${rel}/gi" ${PROGPATH}/config/common.conf find ${PROGPATH} -name \*.sh -exec chmod 755 {} \; find ${PROGPATH}/scripts-available/ -name \*.sh -exec chmod 755 {} \; find ${PROGPATH}/scripts-enabled/ -name \*.sh -exec rm {} \; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-09 10:39:58
|
Revision: 7894 http://syscheck.svn.sourceforge.net/syscheck/?rev=7894&view=rev Author: kinneh Date: 2010-06-09 10:39:47 +0000 (Wed, 09 Jun 2010) Log Message: ----------- 1.5.11 Added Paths: ----------- tags/syscheck-1.5.11/syscheck/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-09 09:17:27
|
Revision: 7893 http://syscheck.svn.sourceforge.net/syscheck/?rev=7893&view=rev Author: kinneh Date: 2010-06-09 09:17:20 +0000 (Wed, 09 Jun 2010) Log Message: ----------- syscheck-1.5.11 Added Paths: ----------- tags/syscheck-1.5.11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-09 09:13:48
|
Revision: 7892 http://syscheck.svn.sourceforge.net/syscheck/?rev=7892&view=rev Author: kinneh Date: 2010-06-09 09:13:38 +0000 (Wed, 09 Jun 2010) Log Message: ----------- add server.xml into backup files Modified Paths: -------------- trunk/syscheck/config/921.conf Modified: trunk/syscheck/config/921.conf =================================================================== --- trunk/syscheck/config/921.conf 2010-06-09 08:47:58 UTC (rev 7891) +++ trunk/syscheck/config/921.conf 2010-06-09 09:13:38 UTC (rev 7892) @@ -16,3 +16,4 @@ HTMF_FILE[5]="${EJBCA_HOME}/conf/database.properties" HTMF_FILE[6]="${JBOSS_HOME}/server/default/conf/keystore/keystore.jks" HTMF_FILE[7]="${JBOSS_HOME}/server/default/conf/keystore/truststore.jks" +HTMF_FILE[8]="${JBOSS_HOME}/server/default/deploy/jboss-web.deployer/server.xml" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-06-09 08:48:04
|
Revision: 7891 http://syscheck.svn.sourceforge.net/syscheck/?rev=7891&view=rev Author: kinneh Date: 2010-06-09 08:47:58 +0000 (Wed, 09 Jun 2010) Log Message: ----------- jboss init.d script now lives in smartcard 2.0 scripts Removed Paths: ------------- trunk/syscheck/misc/other/jboss-init.d Deleted: trunk/syscheck/misc/other/jboss-init.d =================================================================== --- trunk/syscheck/misc/other/jboss-init.d 2010-06-08 10:45:37 UTC (rev 7890) +++ trunk/syscheck/misc/other/jboss-init.d 2010-06-09 08:47:58 UTC (rev 7891) @@ -1,177 +0,0 @@ -#!/bin/sh -# -# JBoss Control Script -# -# To use this script -# run it as root - it will switch to the specified user -# It loses all console output - use the log. -# -# Here is a little (and extremely primitive) -# startup/shutdown script for SuSE systems. It assumes -# that JBoss lives in /usr/local/jboss, it's run by user -# 'jboss' and JDK binaries are in /usr/local/jdk/bin. All -# this can be changed in the script itself. -# -# Either amend this script for your requirements -# or just ensure that the following variables are set correctly -# before calling the script. -# -### BEGIN INIT INFO -# Provides: jboss -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Description: Start the JBoss application server. -### END INIT INFO - -#define where jboss is - this is the directory containing directories log, bin, conf etc -JBOSS_HOME=${JBOSS_HOME:-"/usr/local/jboss"} - -#make java is on your path -JAVAPTH=${JAVAPTH:-"/usr/local/java/bin"} - -#define the classpath for the shutdown class -JBOSSCP=${JBOSSCP:-"$JBOSS_HOME/bin/shutdown.jar:$JBOSS_HOME/client/jnet.jar"} - -#define the script to use to start jboss -JBOSSSH=${JBOSSSH:-"$JBOSS_HOME/bin/run.sh -c default"} - -if [ -f /etc/ejbca/environment ] ; then - source /etc/ejbca/environment -fi - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -. /etc/rc.status - -# First reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - misc error -# 2 - invalid or excess args -# 3 - unimplemented feature (e.g. reload) -# 4 - insufficient privilege -# 5 - program not installed -# 6 - program not configured -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. - -if [ -n "$JBOSS_CONSOLE" -a ! -d "$JBOSS_CONSOLE" ]; then - # ensure the file exists - touch $JBOSS_CONSOLE -fi - -if [ -n "$JBOSS_CONSOLE" -a ! -f "$JBOSS_CONSOLE" ]; then - echo "WARNING: location for saving console log invalid: $JBOSS_CONSOLE" - echo "WARNING: ignoring it and using /dev/null" - JBOSS_CONSOLE="/dev/null" -fi - -#define what will be done with the console log -JBOSS_CONSOLE=${JBOSS_CONSOLE:-"/dev/null"} - -#define the user under which jboss will run, or use RUNASIS to run as the current user -JBOSSUS=${JBOSSUS:-"jboss"} - -#do not overwrite serverlog during startup -move_server_log () { - if [ -f ${JBOSS_HOME}/server/default/log/server.log ] ; then - DATE=`date +"%F"` - FILENAME="${JBOSS_HOME}/server/default/log/server.log.${DATE}.restart" - i=0 - while [ -f $FILENAME ] ; do - i=`expr $i + 1` - FILENAME="${JBOSS_HOME}/server/default/log/server.log.${DATE}.restart.${i}" - done - mv ${JBOSS_HOME}/server/default/log/server.log ${FILENAME} - fi -} - -#check if jboss is running -check_if_running () { -FOO=`ps -ef | grep /usr/local/jboss/bin/run.sh | grep -v grep` - if [ "x$FOO" != "x" ] ; then - echo "Already running" - exit 1 - fi -} - -CMD_START="cd $JBOSS_HOME/bin; $JBOSSSH" -CMD_STOP="java -classpath $JBOSSCP org.jboss.Shutdown --shutdown" - -if [ "$JBOSSUS" = "RUNASIS" ]; then - SUBIT="" -else - SUBIT="su - $JBOSSUS -c " -fi - -if [ -z "`echo $PATH | grep $JAVAPTH`" ]; then - export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:$JAVAPTH -fi - -if [ ! -d "$JBOSS_HOME" ]; then - echo JBOSS_HOME does not exist as a valid directory : $JBOSS_HOME - exit 1 -fi - -case "$1" in -start) - check_if_running - echo -n "Starting JBoss application server: " -# check for non-rotated server.log - move_server_log - cd $JBOSS_HOME/bin - if [ -z "$SUBIT" ]; then - eval $CMD_START >${JBOSS_CONSOLE} 2>&1 & - else - $SUBIT "$CMD_START >${JBOSS_CONSOLE} 2>&1 &" - fi - - echo "Waiting for jboss server to start:" - sleep 5 - while [ "`grep 'Server.*JBoss.*Started' $JBOSS_HOME/server/default/log/server.log 2>/dev/null`x" = "x" ] ; do - echo -n "." - sleep 2 - done - echo "Jboss server is up and running." - - - # Remember status and be verbose - rc_status -v - ;; -stop) - echo -n "Shutting down JBoss application server: " - if [ -z "$SUBIT" ]; then - $CMD_STOP - else - $SUBIT "$CMD_STOP" - fi - while [ "`grep 'Server.*Shutdown.*complete' $JBOSS_HOME/server/default/log/server.log 2>/dev/null`x" = "x" ] ; do - echo -n "." - sleep 2 - done - echo "Jboss server is now stopped." - - # Remember status and be verbose - rc_status -v - ;; -restart) - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; -*) - echo "usage: $0 (start|stop|restart|help)" -esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |