del: remove the special role of the 'env'-CA

diff --git a/collectCRLs b/collectCRLs
index a8cd148249743285a6dd3cf1061b9f64be154a0c..a7818d778cb124d4bcdc3573a55163d8abbb99b2 100755 (executable)
--- 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 99849d74284360b16ffc3060fa0ffd03bc6a3b6a..78a09768cefed2f634ac988ea2562fa6345ec549 100755 (executable)
--- 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 0eba4473de36c779bc1758d957f68493fb5eaaf6..d5e8553151499e41fa4a51f6d6b31bbc0dcae4c0 100755 (executable)
--- 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"