X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=collectSignerConfig.sh;h=d7c3aa64b70b186f4fd6831ab5d3a35ad00db279;hb=6ae3c38ec9e46bea24edfcef895ee14f85f420ff;hp=8a5921c73f29d8efbdd726f8de2e0e390653cf90;hpb=3e36d0b44f5f3862fd324e433f551387ffba859b;p=nre.git

diff --git a/collectSignerConfig.sh b/collectSignerConfig.sh
index 8a5921c..d7c3aa6 100755
--- a/collectSignerConfig.sh
+++ b/collectSignerConfig.sh
@@ -5,11 +5,12 @@ set -e
 year=$1
 
 . structure
+cd generated
 
 installCommKeys() { # peer (server,client)
     peer="$1"
     mkdir -p signer-config/keys
-    cp ${year}/ca/env_${year}_1.ca/key.crt signer-config/keys/ca.crt
+    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
@@ -27,7 +28,7 @@ done
 
 installCommKeys client
 
-tar czf signer-client-$year.tar.gz profiles -C signer-config keys ca
+tar czf signer-client-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
 
 # Updating for server
 rm signer-config/keys/signer_*
@@ -41,6 +42,6 @@ done
 
 installCommKeys server
 
-tar czf signer-server-$year.tar.gz profiles -C signer-config keys ca
+tar czf signer-server-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
 
 rm -R signer-config