Merge branch 'master' of https://git.oopen.de/install/openvpn

get_all_keys.sh

@@ -306,11 +306,11 @@ if $EASYRSA_LAYOUT_NEW ; then
          _cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | grep -oE "CN\s*=\s*[^,]+" | awk '{print$3}')"
       fi
 
-      if ! containsElement "$_cn" "${all_cn_arr[@]}" ; then
+      if ! containsElement "$_serial" "${all_cn_arr[@]}" ; then
          all_arr+=("${_serial}:$(trim $_cn)")
          all_cn_arr+=("$(trim $_cn)")
       fi
-      if ! containsElement "$_cn" "${revoked_cn_arr[@]}" ; then
+      if ! containsElement "$_serial" "${revoked_cn_arr[@]}" ; then
          active_arr+=("${_serial}:$(trim $_cn)")
       fi
       

install_openvpn.sh

@@ -3,7 +3,7 @@
 script_dir="$(dirname $(realpath $0))"
 conf_file=${script_dir}/conf/install_openvpn.conf
 
-_needed_debian_packages="openvpn easy-rsa"
+_needed_debian_packages="openvpn easy-rsa zip"
 
 # - Used if system does NOT support systemd
 # -