X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=inline;f=collectSignerConfig;h=b8e0f91270753262a1e1d0ea0007afbfc00596a2;hb=6267b709651e5f2635b2108e588a0ad67ad899aa;hp=66e7e5b1659a9f8d93d4f23918eae091bbca8cd3;hpb=8d917b2f76db994f733059b47c20457945556281;p=nre.git

diff --git a/collectSignerConfig b/collectSignerConfig
index 66e7e5b..b8e0f91 100755
--- a/collectSignerConfig
+++ b/collectSignerConfig
@@ -7,41 +7,24 @@ year=$1
 . structure.bash
 cd generated
 
-installCommKeys() { # peer (server,client)
-    peer="$1"
-    mkdir -p signer-config/keys
-    cat ${year}/ca/env_${year}_1.ca/key.crt env.ca/key.crt root.ca/key.crt > signer-config/keys/ca.crt
-    for file in signer_${peer}.{crt,key}; do
-        cp ${year}/keys/$file signer-config/keys/$file
-    done
-
-}
-
 mkdir -p signer-config
-for ca in $STRUCT_CAS; do
-    [ "$ca" == "env" ] && continue
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         mkdir -p signer-config/ca/${ca}_${year}_${i}
         cp ${year}/ca/${ca}_${year}_${i}.crt  signer-config/ca/${ca}_${year}_${i}/ca.crt
     done
 done
 
-installCommKeys client
-
-tar czf signer-client-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
+tar czf signer-client-$year.tar.gz -C .. profiles -C generated/signer-config ca
 
 # Updating for server
-rm signer-config/keys/signer_*
 
-for ca in $STRUCT_CAS; do
-    [ "$ca" == "env" ] && continue
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         cp ${year}/ca/${ca}_${year}_${i}.key  signer-config/ca/${ca}_${year}_${i}/ca.key
     done
 done
 
-installCommKeys server
-
-tar czf signer-server-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
+tar czf signer-server-$year.tar.gz -C .. profiles -C generated/signer-config ca
 
 rm -R signer-config