From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sat, 2 May 2026 09:25:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:25:02 02.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=4f12573ff58ec9f3015a93c3faa63455f79d0b61;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:25:02 02.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 981d424d0..3e5a5fafe 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/418/3d78fe4b"; +:global CommitId "main/419/0d8f8a18"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:20:02 02.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:25:02 02.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index d1ad5feea..a80105ea3 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -16,9 +16,9 @@ IPALL_URLS := $(wildcard Makefile.IPALL) # Big CA list with all certificates ~ 2Mb ALL_CA_URL = https://curl.se/ca/cacert.pem -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 +CURL = curl --capath /dev/null --connect-timeout 5 --output /dev/null --silent #--verbose #ifdef IPV4 #CURL := $(CURL) -4 @@ -30,7 +30,7 @@ CURL = curl -sS --fail --max-time 10 --silent #CURL := $(CURL) -4 -6 #endif -.PHONY: default all-ca-lst +.PHONY: default all-ca-lst ca-ipv4 ca-ipv6 ca-ipall $(IPV4_URLS) $(IPV6_URLS) $(IPALL_URLS) # ca-ipv4 ca-ipv6 ca-ipall default: @@ -40,8 +40,8 @@ all-ca-lst: mkdir -p $@ && cd $@ $(CURL) $(ALL_CA_URL) --output $(notdir $<) -ca-ipv4: $(CURL) $(IPV4_URLS) +ca-ipv4: $(IPV4_URLS) mkdir -p $@ && cd $@; \ - for url in $(IPV4_URLS); do \ - $(CURL) $$url --output $$(basename $$url); \ + for url in $^; do \ + $(CURL) $$url --output $(notdir $$url); \ done