|
From: <ki...@us...> - 2010-11-24 16:12:47
|
Revision: 7933
http://syscheck.svn.sourceforge.net/syscheck/?rev=7933&view=rev
Author: kinneh
Date: 2010-11-24 16:12:40 +0000 (Wed, 24 Nov 2010)
Log Message:
-----------
Closes #47 - change name in 905 publish crl so it uses a unique name
Modified Paths:
--------------
trunk/syscheck/config/905.conf
trunk/syscheck/related-available/905_publish_crl.sh
Modified: trunk/syscheck/config/905.conf
===================================================================
--- trunk/syscheck/config/905.conf 2010-11-23 13:27:38 UTC (rev 7932)
+++ trunk/syscheck/config/905.conf 2010-11-24 16:12:40 UTC (rev 7933)
@@ -2,42 +2,42 @@
HOURTHRESHOLD=1
-CANAME[0]=MSDomainLogonCA
+CRLCANAME[0]=MSDomainLogonCA
REMOTE_HOST[0]=localhost
CRLTO_DIR[0]='/srv/www/htdocs/crl/'
CRL_NAME[0]=MSDomainLogonCA.crl
SSHUSER[0]=
SSHKEY[0]=
-CANAME[1]=eSignCA
+CRLCANAME[1]=eSignCA
REMOTE_HOST[1]=localhost
CRLTO_DIR[1]='/srv/www/htdocs/crl/'
CRL_NAME[1]=eSignCA.crl
SSHUSER[1]=
SSHKEY[1]=
-CANAME[2]=ServerCA
+CRLCANAME[2]=ServerCA
CRLTO_DIR[2]='/srv/www/htdocs/crl/'
REMOTE_HOST[2]=localhost
CRL_NAME[2]=ServerCA.crl
SSHUSER[2]=
SSHKEY[2]=
-CANAME[3]=eIDCA
+CRLCANAME[3]=eIDCA
CRLTO_DIR[3]='/srv/www/htdocs/crl/'
REMOTE_HOST[3]=localhost
CRL_NAME[3]=eIDCA.crl
SSHUSER[3]=
SSHKEY[3]=
-CANAME[4]=MachineCertCA
+CRLCANAME[4]=MachineCertCA
CRLTO_DIR[4]='/srv/www/htdocs/crl/'
REMOTE_HOST[4]=localhost
CRL_NAME[4]=MachineCertCA.crl
SSHUSER[4]=
SSHKEY[4]=
-CANAME[5]=SoftTokenCA
+CRLCANAME[5]=SoftTokenCA
CRLTO_DIR[5]='/srv/www/htdocs/crl/'
REMOTE_HOST[5]=localhost
CRL_NAME[5]=SoftTokenCA.crl
Modified: trunk/syscheck/related-available/905_publish_crl.sh
===================================================================
--- trunk/syscheck/related-available/905_publish_crl.sh 2010-11-23 13:27:38 UTC (rev 7932)
+++ trunk/syscheck/related-available/905_publish_crl.sh 2010-11-24 16:12:40 UTC (rev 7933)
@@ -124,14 +124,14 @@
}
-for (( i=0; i < ${#CANAME[@]} ; i++ )){
+for (( i=0; i < ${#CRLCANAME[@]} ; i++ )){
tempdir=$(mktemp -d)
trap 'rm -rf "$tempdir"' EXIT
CRLFILE=${tempdir}/${CRL_NAME[$i]}
- get ${CANAME[$i]} "${CRLFILE}"
+ get ${CRLCANAME[$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
@@ -142,7 +142,7 @@
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]}
+ printlogmess $INFO $ERRNO_1 "$PUBL_DESCR_1" ${CRLCANAME[$i]}
else
printlogmess $ERROR $ERRNO_3 "$PUBL_DESCR_3" ${CRL_NAME[$i]} "${CRLTO_DIR[$i]}/${CRL_NAME[$i]}"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
