From 9ee478d647fb01c107285a16c6e0165e7e076fe5 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sat, 2 May 2026 00:55:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 00:55:02 02.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/certs/Makefile | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 75ae627db..dbfc5d8db 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/396/b5b20d01"; +:global CommitId "main/397/5aaba090"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 00:40:02 02.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 00:55:02 02.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index 0f7890712..839ee8ffd 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -59,7 +59,7 @@ BOTH = \ raw.githubusercontent.com/ISRG-Root-X1 \ upgrade.mikrotik.com/ISRG-Root-X1 -.PHONY: default help big-ca-list dual ipv4 ipv6 +.PHONY: default help big-ca-list $(BOTH) $(IPV4) $(IPV6) all: big-ca-list @@ -70,8 +70,9 @@ help: echo "Usage: make [target]"; \ echo "Targets:"; \ echo " default: Show this help message"; \ - echo " all: Check all certificates (DUAL, IPV4, IPV6)"; \ - echo " dual: Check certificates for DUAL domains"; \ + echo " all: Download BIG CA list using target big-ca-list"; \ + echo " big-ca-list: Download the big CA list from curl.se"; \ + echo " both: Check certificates for both IPV4 and IPV6 domains"; \ echo " ipv4: Check certificates for IPV4 domains"; \ echo " ipv6: Check certificates for IPV6 domains"; \ echo " help: Show this help message\n"; \ @@ -89,7 +90,8 @@ $(BIG_CA_DIR): $(BIG_CA_CMD): ifndef NOIPV4 $(BIG_CA_CMD):= $@ -4 -elseifndef NOIPV6 + +ifndef NOIPV6 $(BIG_CA_CMD):= $@ -6 endif @@ -98,7 +100,13 @@ $(BIG_CA_URL): $(BIG_CA_DIR) big-ca-list: $(BIG_CA_URL) -dual: $(DUAL) +$(BOTH): +ifndef NOIPV4 + $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@) +endif +ifndef NOIPV6 + $(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@) +endif $(IPV4): ifndef NOIPV4 -- 2.52.0