From 553f89ebf94b60ee8f95203955de570cb9d2ea96 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 2 Nov 2022 17:19:38 +0100
Subject: [PATCH] 
 add_dkim_key.sh/add_dkim_key.conf.sampl/create_opendkim_key.conf.sample: some
 minor changes.

---
 add_dkim_key.sh                      | 52 ++++------------------------
 conf/add_dkim_key.conf.sample        |  2 +-
 conf/create_opendkim_key.conf.sample |  7 +++-
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/add_dkim_key.sh b/add_dkim_key.sh
index 8ce277f..8179930 100755
--- a/add_dkim_key.sh
+++ b/add_dkim_key.sh
@@ -598,50 +598,10 @@ END
 fi
 
 
+info "Flush update data from .jnl files of domain \033[1m${DKIM_UPDATE_ZONE}\033[m back to the zone file:
+
+             rndc freeze <zone>  -  \033[1mrndc freeze ${DKIM_UPDATE_ZONE}\033[m
+             rndc thaw <zone     -  \033[1mrndc thaw ${DKIM_UPDATE_ZONE}\033[m"
+
+
 clean_up 0
-
-
-str=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvaTqQUFMzoBZ9dAnLBUbxg5ArcZ8BAKCJAxSvwsyDoUwqYOLAtd08dLN+UHemkNJHnlPjJ0fYQw/lyLanVhUB+SX/KPq5i7yuW4vBrONOxM5Jrq4zbX+eFrxTIflF3TLjsv36TfQYgovztDB13qOAi3YPCMvyrGQqBVgxTaYZt5UiDiWhOIY8ra0oJ63dHd8mzdL7n6jDBHB8dofSzYN5v3nDObc4Svk8XeFE+cMkjRWhQcyYcWJZO/aPLFewKfiUGZTKh6RFrkt2jM5RXIMeYVi8m6h8QMTfVhejevUQhyvSuaKkPFIEH5FDnA6nYQnS9aDR7Vw6PteCwrcmeZfiwIDAQAB
-
-_tmp_str="$(echo "$str" | cut --output-delimiter=$':' -c1-64,65-128,129-192,193-256,257-320,321-384,385-)"
-
-CUR_IFS="$IFS"
-
-IFS=':'
-read -a str_arr <<< "$_tmp_str"
-IFS=$CUR_IFS
-
-new_str=""
-for (( i=0; i < ${#str_arr[@]}; i++ )) ; do
-   new_str+="$(echo -n "\"${str_arr[$i]}\" ")"
-done
-
-
-echo ""
-echo "$new_str"
-echo ""oo
-
-declare -a out_str=()
-
-
-
-DKIM_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvaTqQUFMzoBZ9dAnLBUbxg5ArcZ8BAKCJAxSvwsyDoUwqYOLAtd08dLN+UHemkNJHnlPjJ0fYQw/lyLanVhUB+SX/KPq5i7yuW4vBrONOxM5Jrq4zbX+eFrxTIflF3TLjsv36TfQYgovztDB13qOAi3YPCMvyrGQqBVgxTaYZt5UiDiWhOIY8ra0oJ63dHd8mzdL7n6jDBHB8dofSzYN5v3nDObc4Svk8XeFE+cMkjRWhQcyYcWJZO/aPLFewKfiUGZTKh6RFrkt2jM5RXIMeYVi8m6h8QMTfVhejevUQhyvSuaKkPFIEH5FDnA6nYQnS9aDR7Vw6PteCwrcmeZfiwIDAQAB
-
-length="${#DKIM_KEY}"
-declare -i i=0
-declare -i pos_begin=0
-declare -i pos_end=64
-
-p_val=""
-while [[ $pos_end -lt $length ]] ; do
-   p_val+="\"$(echo "${str:$pos_begin:64}")\" "
-   #echo "${str:$pos_begin:64}"
-   pos_begin=$pos_end
-   pos_end=$(expr $pos_end + 64)
-done
-#echo "${str:$pos_begin}"
-p_val+="\"$(echo "${str:$pos_begin}")\""
-
-echo ""
-echo "p=$p_val"
-echo ""
diff --git a/conf/add_dkim_key.conf.sample b/conf/add_dkim_key.conf.sample
index 16bc6ca..0f5c7b4 100644
--- a/conf/add_dkim_key.conf.sample
+++ b/conf/add_dkim_key.conf.sample
@@ -41,7 +41,7 @@
 # - Example:
 # -
 # -    # Key b.ns.oopen.de
-# -    KEY_SECRET="EtvvMdW0PXD4GMHP+onuHZ0dT/Z8OSJGlce/xH10OwI="
+# -    KEY_SECRET="4woPu0jqf9Jp1IX+gduJ3BVW/1ZMeyCPTQMqEsMXLFw="
 # -
 # -    # Key dns0.warenform.de
 # -    KEY_SECRET="qG9e/gOucCXcwVUTU+uewU0Yth1iJh2JHgnogrHvh2A="
diff --git a/conf/create_opendkim_key.conf.sample b/conf/create_opendkim_key.conf.sample
index b0f6eb6..82f8ff5 100644
--- a/conf/create_opendkim_key.conf.sample
+++ b/conf/create_opendkim_key.conf.sample
@@ -51,7 +51,12 @@
 # - DKIM TXT record.
 # -
 # - Example:
-# -    key_secret="EtvvMdW0PXD4GMHP+onuHZ0dT/Z8OSJGlce/xH10OwI="
+# -
+# -    # Key b.ns.oopen.de
+# -    key_secret="4woPu0jqf9Jp1IX+gduJ3BVW/1ZMeyCPTQMqEsMXLFw="
+# -
+# -    # Key dns0.warenform.de
+# -    key_secret="qG9e/gOucCXcwVUTU+uewU0Yth1iJh2JHgnogrHvh2A="
 # -
 #key_secret=""