X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=collectGigiConfig.sh;h=ee8b4f38108cbcfd651d2a32c21773bf042c33b8;hb=6ae3c38ec9e46bea24edfcef895ee14f85f420ff;hp=62343b72b444ee1e1546f67c599f16fb92b32911;hpb=1eedd605f300425a0c1a502b4bdb3e8d2f79b611;p=nre.git

diff --git a/collectGigiConfig.sh b/collectGigiConfig.sh
index 62343b7..ee8b4f3 100755
--- a/collectGigiConfig.sh
+++ b/collectGigiConfig.sh
@@ -7,16 +7,23 @@ year=$1
 . structure
 cd generated
 
-mkdir -p gigi-config/ca
-cp root.ca/key.crt gigi-config/ca/root.crt
+mkdir -p gigi-config/config/ca
+cp root.ca/key.crt gigi-config/config/ca/root.crt
 for ca in $STRUCT_CAS; do
-    cp ${ca}.ca/key.crt gigi-config/ca/${ca}.crt
+    cp ${ca}.ca/key.crt gigi-config/config/ca/${ca}.crt
     [ "$ca" == "env" ] && continue
     for i in $TIME_IDX; do
-	cp ${year}/ca/${ca}_${year}_${i}.crt gigi-config/ca/${ca}_${year}_${i}.crt
+	cp ${year}/ca/${ca}_${year}_${i}.crt gigi-config/config/ca/${ca}_${year}_${i}.crt
     done
 done
 
-tar czf gigi-$year.tar.gz -C .. profiles -C generated/gigi-config ca
+cp -R ../profiles gigi-config/config
+
+mkdir -p gigi-config/keys
+for k in ${year}/keys/{api,mail,secure,static,www}.pkcs12; do
+   cp $k gigi-config/keys
+done
+
+tar czf gigi-$year.tar.gz -C gigi-config config keys
 
 rm -Rf gigi-config