|
@@ -4,7 +4,7 @@
|
4
|
# license: GPL 2.0
|
4
|
# license: GPL 2.0
|
5
|
# create 2022
|
5
|
# create 2022
|
6
|
#
|
6
|
#
|
7
|
-version="0.5.1";
|
|
|
|
|
7
|
+version="0.5.2";
|
8
|
sname="avto4certbot";
|
8
|
sname="avto4certbot";
|
9
|
|
9
|
|
10
|
# script path
|
10
|
# script path
|
|
@@ -216,6 +216,16 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
|
216
|
if [ -d $path_cert/$site_name ]; then
|
216
|
if [ -d $path_cert/$site_name ]; then
|
217
|
keydate=$(ls -l --time-style=long-iso $path_cert/$site_name/cert.pem |awk {'print$6'});
|
217
|
keydate=$(ls -l --time-style=long-iso $path_cert/$site_name/cert.pem |awk {'print$6'});
|
218
|
keytime=$(ls -l --time-style=long-iso $path_cert/$site_name/cert.pem |awk {'print$7'});
|
218
|
keytime=$(ls -l --time-style=long-iso $path_cert/$site_name/cert.pem |awk {'print$7'});
|
|
|
219
|
+ if [ ! -f $path_ssl/certs/$site_name.pem ]; then
|
|
|
220
|
+ ((event_sw++));
|
|
|
221
|
+ cp -f $path_ssl/private/$site_name.pem $path_ssl/certs/$site_name.pem
|
|
|
222
|
+ cd $path_ssl/certs
|
|
|
223
|
+ chmod 600 $site_name.pem
|
|
|
224
|
+ ln -sf $site_name.pem `openssl x509 -noout -hash < $site_name.pem`.0
|
|
|
225
|
+ cd $path_ssl
|
|
|
226
|
+ echo "$(date) - $sname: update cert for $site_name">> $log_file;
|
|
|
227
|
+ fi
|
|
|
228
|
+
|
219
|
if [[ "$keydate" = "$rdate" ]] && [[ "$keytime" = "$rtime" ]]; then
|
229
|
if [[ "$keydate" = "$rdate" ]] && [[ "$keytime" = "$rtime" ]]; then
|
220
|
((event_sw++));
|
230
|
((event_sw++));
|
221
|
cp -f $path_ssl/private/$site_name.pem $path_ssl/certs/$site_name.pem
|
231
|
cp -f $path_ssl/private/$site_name.pem $path_ssl/certs/$site_name.pem
|
|
@@ -245,6 +255,11 @@ for ((xd=0; xd != ${#domains[@]}; xd++)); do
|
245
|
cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/$site_name.pem;
|
255
|
cat $path_cert/$site_name/fullchain.pem > $path_ssl/private/$site_name.pem;
|
246
|
cat $path_cert/$site_name/privkey.pem >> $path_ssl/private/$site_name.pem;
|
256
|
cat $path_cert/$site_name/privkey.pem >> $path_ssl/private/$site_name.pem;
|
247
|
echo "$path_ssl/$site_name.pem">>/etc/ssl/crt-list.txt
|
257
|
echo "$path_ssl/$site_name.pem">>/etc/ssl/crt-list.txt
|
|
|
258
|
+ cp -f $path_ssl/private/$site_name.pem $path_ssl/certs/$site_name.pem
|
|
|
259
|
+ cd $path_ssl/certs
|
|
|
260
|
+ chmod 600 $site_name.pem
|
|
|
261
|
+ ln -sf $site_name.pem `openssl x509 -noout -hash < $site_name.pem`.0
|
|
|
262
|
+ cd $path_ssl
|
248
|
fi
|
263
|
fi
|
249
|
done
|
264
|
done
|
250
|
}
|
265
|
}
|