From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sat, 2 May 2026 09:10:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:03 02.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=8514b88457863b3f73941e9ce4c700cba4acbbd9;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:03 02.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 9f5b669ea..6e600ce8b 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/415/03482696"; +:global CommitId "main/416/2c91e355"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:55:03 02.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:03 02.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index 7cebb1966..ae305fa98 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -10,42 +10,31 @@ 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 +ALL_CA_URL = https://curl.se/ca/cacert.pem -CURL := $(shell which curl) -CURL := $(CURL) -sS --fail --max-time 10 --silent +CURL = curl -sS --fail --max-time 10 --silent +# 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) -4 -6 -endif +#ifdef IPV4 +#CURL := $(CURL) -4 +#endif +#ifdef IPV6 +#CURL := $(CURL) -6 +#endif +#ifdef IPVALL +#CURL := $(CURL) -4 -6 +#endif -.PHONY: default ca-list ca-ipv4 ca-ipv6 ca-ipall +.PHONY: default all-ca-lst +# ca-ipv4 ca-ipv6 ca-ipall default: - @echo "Usage: make target"; - @echo "Targets:"; - @echo " default: Show this help message"; - @echo " all: Download BIG CA list using target caBigList"; - @echo " caBigList: Download the big CA list from curl.se"; - @echo " ca-ipv4: Check certificates for IPV4 domains"; - @echo " ca-ipv6: Check certificates for IPV6 domains"; - @echo " ca-ipall: Check certificates for all IP versions"; - @echo "Environment variables:"; - @echo " IPV4=true: Enable IPV4 checks and downloads all available certificates from Makefile.IPV4 to ca-ipv4 directory (default)"; - @echo " IPV6=true: Enable IPV6 checks and downloads all available certificates from Makefile.IPV6 to ca-ipv6 directory (default: false)"; - @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)"; + @echo "Enable downloading the big CA list from curl.se to ca-list directory (default: true)"; ca-list: mkdir -p $@ && cd $@