recreate function scanCerts & scanSsl 28.02.25:01.42

README.md

@@ -1,6 +1,6 @@
 #### Package scripts for auto update all certs.
 #### Uses apache2 or nginx and the certbot package.
-#### avto4certbot version:0.5.0
+#### avto4certbot version:0.5.1
 
 * If the error “Peer's Certificate issuer is not recognized” occurs, use the following parameter: 
 

src/avto4certbot.sh

@@ -204,7 +204,6 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
 done
 }
 
-
 ##--@F exec task
 function scanSSL(){
 ## if event - yes
@@ -219,11 +218,6 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
     keytime=$(ls -l --time-style=long-iso $path_cert/$site_name/cert.pem |awk {'print$7'});
     if [[ "$keydate" = "$rdate" ]] && [[ "$keytime" = "$rtime" ]]; then
       ((event_sw++));
-        cat $path_cert/$site_name/privkey.pem > $path_ssl/private/privkey_$site_name.pem;
-        cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/fullchain_$site_name.pem;
-        cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/$site_name.pem;
-        cat $path_cert/$site_name/privkey.pem >> $path_ssl/private/$site_name.pem;
-      #
         cp -f $path_ssl/private/$site_name.pem $path_ssl/certs/$site_name.pem
         cd $path_ssl/certs
         chmod 600 $site_name.pem
@@ -234,11 +228,25 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
   fi
 done
 
-  :> /etc/ssl/crt-list.txt
-  for ((xd=0; xd != ${#domains[@]}; xd++)); do
-    local site_data=( $(echo -e ${domains[$xd]}|sed 's/ /\n /g') );
-    echo "$path_ssl/private/${site_data[0]}.pem">>/etc/ssl/crt-list.txt
-  done
+if [ $event_sw != 0 ];then
+  flistCerts;
+fi
+}
+
+##--@F create from ssl
+function flistCerts(){
+echo>/etc/ssl/crt-list.txt
+for ((xd=0; xd != ${#domains[@]}; xd++)); do
+  local site_data=( $(echo -e ${domains[$xd]}|sed 's/ /\n /g') );
+  site_name="${site_data[0]}";
+  if [ -d $path_cert/$site_name ]; then
+    cat $path_cert/$site_name/privkey.pem > $path_ssl/private/privkey_$site_name.pem;
+    cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/fullchain_$site_name.pem;
+    cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/$site_name.pem;
+    cat $path_cert/$site_name/privkey.pem >> $path_ssl/private/$site_name.pem;
+    echo "$path_ssl/$site_name.pem">>/etc/ssl/crt-list.txt
+  fi
+done
 }
 
 ##--@F create configs
@@ -250,6 +258,7 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
   site_port="${site_data[2]}";
   ## apache2 config
   if [[ "$opt" != "" ]] && [[ $opt != "nginx" ]] && [[ "$opt" == "apache" ]]; then
+    ## добавить проверку режима apache2 и путь для активации конфигурации
     echo >$conf_dir/$site_name.conf;
     echo -e '<VirtualHost *:'"$site_port"'>' >>$conf_dir/$site_name.conf;
     echo -e '  ServerName '"$site_name"'' >>$conf_dir/$site_name.conf;
@@ -418,9 +427,8 @@ if [ "$opt" != "" ]; then
   checkDep;
   if [ "$sw_proxy" == "proxy" ]; then
     if [[ "$http_proxy" != "" ]] && [[ "$(systemctl list-units|grep "$http_proxy"|wc -m)" != "0" ]]; then
-      scanSSL;
+      flistCerts;
       systemctl restart $http_proxy
-      sleep 2;
       updateScs;
     else
         reports=()
@@ -429,9 +437,8 @@ if [ "$opt" != "" ]; then
         exit
     fi
   else
-      scanSSL;
+      flistCerts;
       systemctl restart $web_service;
-      sleep 2;
       updateScs;
   fi
 else