From: vados-dev <192440777+vados-dev@users.noreply.github.com>
Date: Sat, 2 May 2026 01:30:03 +0000 (+0300)
Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:30:02 02.05.2026.
X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=d2e8a4f6aaf537a65bb70983ed6c38a2ae22691e;p=Mikrotiks%2Fros.vados.ru.git

Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:30:02 02.05.2026.
---

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 972a8d0ce..554ac9f8c 100644
--- 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/401/b55e8919";
+:global CommitId "main/402/11e6cd2f";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:05:02 02.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:30:02 02.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
diff --git a/html/certs/Makefile b/html/certs/Makefile
index b0a05c5c2..cc63d12ba 100644
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -1,31 +1,34 @@
 # Makefile to check certificates
-#SHELL=		/bin/sh
 
-PWD_DIR = $(shell pwd)
-CERTS_DIR?= ./certs
-CERTS_DIR:= $($PWD_DIR $(abspath $(CERTS_DIR)))
+BUILD_DIR = $(shell pwd)
+#CERTS_DIR?= ./certs
+#CERTS_DIR:= $($BUILD_DIR $(abspath $(CERTS_DIR)))
 
-#CERTS_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+SHELL := /bin/bash
 
-# Big CA list with all certificates ~ 2Mb
-BIG_CA_URL = https://curl.se/ca/cacert.pem
-BIG_CA_CMD = curl -s -o
-BIG_CA_DIR?= $(CERTS_DIR)/all-ca
-BIG_CA_DIR:= $(abspath $(BIG_CA_DIR))
+IPV4:= true
+IPV6:= false
+IPALL:= false
+CALIST:= true
 
-#CONTRIB?=	../contrib
-#CONTRIB:=	$(abspath $(CONTRIB))
-#SHELL := /bin/bash
-CURL = curl \
-	--capath /dev/null \
-	--connect-timeout 5 \
-	--output /dev/null \
-	--silent
+IPV4_URLS  := $(wildcard Makefile.IPV4)
+IPV6_URLS  := $(wildcard Makefile.IPV6)
+IPALL_URLS := $(wildcard Makefile.IPALL)
 
-#	--verbose
+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
+CURL  := $(CURL) -4
+endif
+ifdef IPV6
+CURL  := $(CURL) -6
+endif
+ifdef IPVALL
+CURL  := $(CURL) -
+endif
 
-NOIPV4 ?= false
-NOIPV6 ?= false
 
 IPV4 = \
 	1.1.1.1/SSL-com-Root-Certification-Authority-ECC \
@@ -84,17 +87,8 @@ help:
 		 echo "  make $(IPV4) NOIPV4=true"; \
 	}
 
-$(BIG_CA_DIR):
-	mkdir -p $@ && cd $@
-
-$(BIG_CA_CMD):
-ifndef NOIPV4
-    $(BIG_CA_CMD):= $@ -4
-endif
-
-ifndef NOIPV6
-	$(BIG_CA_CMD):= $@ -6
-endif
+#$(BIG_CA_DIR):
+#	mkdir -p $@ && cd $@
 
 $(BIG_CA_URL): $(BIG_CA_DIR)
 	$(BIG_CA_CMD) $@ $^
@@ -102,12 +96,6 @@ $(BIG_CA_URL): $(BIG_CA_DIR)
 big-ca-list: $(BIG_CA_URL)
 
 $(BOTH):
-ifndef NOIPV4
-	$(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
-endif
-ifndef NOIPV6
-	$(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@)
-endif
 
 $(IPV4):
 ifndef NOIPV4