From aee9d9d4b01e97e94578f2e01172374bd5996b0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 22 Apr 2016 17:46:11 +0200 Subject: [PATCH] del: remove the special role of the 'env'-CA --- collectCRLs | 1 - generateHtdocs | 4 ---- generateTime | 5 ----- 3 files changed, 10 deletions(-) diff --git a/collectCRLs b/collectCRLs index a8cd148..a7818d7 100755 --- a/collectCRLs +++ b/collectCRLs @@ -14,7 +14,6 @@ fetchCRLS(){ #year, cyear month timeIdx cyear=$2 month=$3 timeIdx=$4 - cp -v $year/ca/env_${year}_${timeIdx}.ca/${cyear}_${month}.crl crls-${year}/$cyear-$month/${year}/env_${year}_${timeIdx}.crl # no "for ca in $STRUCT_CAs" because that's cassiopeias work. } diff --git a/generateHtdocs b/generateHtdocs index 99849d7..78a0976 100755 --- a/generateHtdocs +++ b/generateHtdocs @@ -12,11 +12,7 @@ for ca in root $STRUCT_CAS; do cp $ca.ca/key.crt htdocs/crt/g2/$ca.crt done -for i in $TIME_IDX; do - cp $year/ca/env_${year}_${i}.ca/key.crt htdocs/crt/g2/$year/env-${i}.crt -done for ca in $STRUCT_CAS; do - [[ "$ca" == "env" ]] && continue for i in $TIME_IDX; do cp $year/ca/${ca}_${year}_${i}.crt htdocs/crt/g2/$year/${ca}-${i}.crt done diff --git a/generateTime b/generateTime index 0eba447..d5e8553 100755 --- a/generateTime +++ b/generateTime @@ -44,12 +44,7 @@ for i in $TIME_IDX; do epoint=$((${year} + 2 ))${epoints[${i}]} fi - . ../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 genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i} genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint" -- 2.39.2