X-Git-Url: https://code.wpia.club/?p=nre.git;a=blobdiff_plain;f=generateTime.sh;h=300d823857f7c2ab8a3eaae120fb926b7d99f4c7;hp=868ef9aa039da214eede4143e7f10151e98b8854;hb=26af5d502565f10a3d3d91192e5545f59075ca59;hpb=63cc9ae0405e4143bb7f02a2a3a548a52610d0f7

diff --git a/generateTime.sh b/generateTime.sh
index 868ef9a..300d823 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -6,6 +6,8 @@
 [ "$1" == "" ] && echo "Usage: $0 <year>" && exit 1
 year=$1
 
+cd generated
+
 genTimeCA(){ #csr,ca to sign with,start,end
     cat <<TESTCA > timesubca.cnf
 basicConstraints = CA:true
@@ -14,8 +16,8 @@ keyUsage = keyCertSign, cRLSign
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always
 
-crlDistributionPoints=URI:http://g2.crl.cacert.org/g2/$2.crl
-authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/$2.crt
+crlDistributionPoints=URI:http://g2.crl.${DOMAIN}/g2/$2.crl
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.${DOMAIN},caIssuers;URI:http://g2.crt.${DOMAIN}/g2/$2.crt
 TESTCA
     caSign $1 $2 timesubca.cnf "$3" "$4"
     rm timesubca.cnf
@@ -33,13 +35,13 @@ for i in $TIME_IDX; do
 	epoint=$((${year} + 2 ))${epoints[${i}]}
     fi
 
-    . CAs/env
+    . ../CAs/env
     genca "/CN=$name ${year}-${i}" $year/ca/env_${year}_${i}
     genTimeCA $year/ca/env_${year}_${i}.ca/key env "$point" "$epoint"
     
     for ca in $STRUCT_CAS; do
 	[ "$ca" == "env" ] && continue
-	. CAs/$ca
+	. ../CAs/$ca
 	genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i}
 	genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint"
     done