rebuild project 11.10.21:05.01

certbot.conf

@@ -0,0 +1,3 @@
+adminmail="admin@mydomen.com";
+domains=( "mydomen.org"
+           );

cleate_certs.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 # create new cert
-domains=( "mydomain.ru" "dev.mydomain.ru" "webmail.mydomain.ru" );
-adminmail="admin@mydomain.ru";
+src="/etc/scripts/autocertbot/certbot.conf"
 
 function createCert() {
+certbot register --agree-tos -m $adminmail;
+/etc/init.d/haproxy stop;
+
 for ((dmn=0; dmn != ${#domains[@]}; dmn++))
     do
-certbot certonly --standalone -d ${domains[$dmn]} --non-interactive --agree-tos --email $adminmail  --http-01-port=55777
-done
+      certbot certonly --preferred-challenges http --standalone -d ${domains[$dmn]};
+    done
+/etc/init.d/haproxy start;
 }
 
 createCert;

dehydrated/make_ssl-dehydrated.sh

@@ -4,7 +4,7 @@
 #
 path_ssl="/etc/ssl/private";
 path_certbot="/var/lib/dehydrated/certs";
-domains=( "mydomain.ru" "webmail.mydomain.ru" "dev.mydomain.ru" );
+src="/etc/scripts/autocertbot/certbot.conf"
 
 function makeSslPem() {
 for ((dmn=0; dmn != ${#domains[@]}; dmn++))
@@ -14,6 +14,7 @@ for ((dmn=0; dmn != ${#domains[@]}; dmn++))
     cat $path_certbot/${domains[$dmn]}/fullchain.pem >> $path_ssl/${domains[$dmn]}.pem;
     cat $path_certbot/${domains[$dmn]}/privkey.pem >> $path_ssl/${domains[$dmn]}.pem;
 done
+makePemList;
 }
 
 function makePemList() {
@@ -24,8 +25,21 @@ for ((icrt=0; icrt != ${#domains[@]}; icrt++))
 done
 }
 
+function checkCert() {
+if [ $(dehydrated -c -4|grep 'Certificate will not expire'|wc -l) != 0 ];
+    then
+        echo "$(date +%c) certbot(dehydrated): no certificates to upgrade...">>$logfile;
+        exit;
+    else
+        makeSslPem;
+        /etc/init.d/haproxy restart;
+        echo "$(date +%c) certbot(dehydrated): updating sertificate">>$logfile;
+fi
+}
+
+
+
 ## create sets.pem
-makeSslPem;
-makePemList;
+checkCert;
 
 

dehydrated/renew-ssl.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# renew certbot ssl certificates
-#
-logfile="/var/log/syslog";
-
-if [ $(dehydrated -c -4|grep 'Certificate will not expire'|wc -l) != 0 ];
-    then
-	echo "$(date +%c) certbot(dehydrated): no certificates to upgrade...">>$logfile;
-	exit;
-    else
-	/etc/scripts/sertbot/dehydrated/make_ssl-dehydrated.sh;
-	/etc/init.d/haproxy restart;
-	echo "$(date +%c) certbot(dehydrated): updating sertificate">>$logfile;
-fi