Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:55:03 02.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 23cabc3b361a36110fb18d4cae149fc3243e6621..9f5b669eaacfc980913c8a1c97fccad2dbd1a63d 100644 (file)
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/414/6a079207";
+:global CommitId "main/415/03482696";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 09:00:03 02.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:55:03 02.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/certs/Makefile b/html/certs/Makefile
index 8a269338def3a20ea14cf75de49d5362a4a3de20..7cebb19667063bd1a20edc78d8c3b350e21955ea 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -6,19 +6,18 @@ BUILD_DIR = $(shell pwd)
 
 SHELL := /bin/bash
 
-IPV4:= true
-IPV6:= false
-IPALL:= false
-CALIST:= true
+IPV4 = true
+IPV6 = false
+IPALL = false
 
-IPV4_URLS  := $(wildcard Makefile.IPV4)
-IPV6_URLS  := $(wildcard Makefile.IPV6)
-IPALL_URLS := $(wildcard Makefile.IPALL)
+IPV4_URLS = $(wildcard Makefile.IPV4)
+IPV6_URLS = $(wildcard Makefile.IPV6)
+IPALL_URLS = $(wildcard Makefile.IPALL)
 # Big CA list with all certificates ~ 2Mb
-CALIST_URL = https://curl.se/ca/cacert.pem
+CALIST_URL := https://curl.se/ca/cacert.pem
 
-CURL  ?= $(shell which curl)
-CURL  ?= $(CURL) -sS --fail --max-time 10 --silent
+CURL := $(shell which curl)
+CURL := $(CURL) -sS --fail --max-time 10 --silent
 # --capath /dev/null --connect-timeout 5 --output /dev/null --silent #--verbose
 
 ifdef IPV4
@@ -48,31 +47,12 @@ default:
        @echo "  IPALL=true: Enable checks for all IP versions and downloads all available certificates from Makefile.IPALL to ca-ipall directory (default: false)";
        @echo "  CALIST=true: Enable downloading the big CA list from curl.se to ca-list directory (default: true)";
 
-caBigList: $(CALIST_URL)
+ca-list:
     mkdir -p $@ && cd $@
-       $(CURL) $< --output $(notdir $<)
+       $(CURL) $(CALIST_URL) --output $(notdir $<)
 
 ca-ipv4: $(IPV4_URLS)
        mkdir -p $@ && cd $@; \
        for url in $(IPV4_URLS); do \
                $(CURL) https://$($ur); \
                done
-
-
-ifndef NOIPV4
-       $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
-endif
-
-$(IPV6):
-ifndef NOIPV6
-       $(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@)
-endif
-
-# DUAL:
-#      git.eworm.de/Root-YE \
-#      rsc.eworm.de/Root-YE \
-
-# My:
-#      letsencrypt.org/certs/isrgrootx1 \
-#      letsencrypt.org/certs/isrgrootx2 \
-#      letsencrypt.org/certs/starfieldroot-g2 \