]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:40:02 02.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Sat, 2 May 2026 02:40:03 +0000 (05:40 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Sat, 2 May 2026 02:40:03 +0000 (05:40 +0300)
html/AM-GlobalFunc.rsc
html/certs/Makefile
html/certs/Makefile.IPV4

index b4c33a71ff94817cee8d6fc0d75ebf2f154a7907..9bee4d332fe14c2ca4f27901b6823f7641e223e3 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/406/7c5c7a96";
+:global CommitId "main/407/01926035";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:20:03 02.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:40:02 02.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
index 4aef7f752c7bb64d78359d9611bb0009c5fc409a..83fbc13d14c234226b33f03839dedd048ee2710d 100644 (file)
@@ -56,12 +56,16 @@ help:
                 echo "  CALIST=true: Enable downloading the big CA list from curl.se to ca-list directory (default: true)"; \
        }
 
-ca-list: $(CA)
+ca-list: $(CALIST_URL)
     mkdir -p $@ && cd $@; \
+       $(CURL) $< --output $(notdir $<)
 
-$(BOTH):
+ca-ipv4: $(IPV4_URLS)
+       mkdir -p $@ && cd $@; \
+       for url in $(IPV4_URLS); do \
+               $(CURL) --cacert $(notdir $$url).pem https://$$(dirname $$url); \
+               done
 
-$(IPV4):
 ifndef NOIPV4
        $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
 endif
index 07d8050e669eed4df366ee8fc820540d18732b26..5ae876f290b8ccdc827453ff54f493bf516ec8b2 100644 (file)
@@ -1,2 +1,14 @@
-       1.1.1.1/SSL-com-Root-Certification-Authority-ECC        8.8.8.8/GTS-Root-RX     9.9.9.9/DigiCert-Global-Root-G3         api.mullvad.net/ISRG-Root-X1    ipv4.showipv6.de/ISRG-Root-X1   ipv4.tunnelbroker.net/Starfield-Root-Certificate-Authority-G2   mkcert.org/ISRG-Root-X1         mkcert.org/DigiCert-Global-Root-G3      mkcert.org/DigiCert-TLS-RSA4096-Root-G5         mkcert.org/DigiCert-TLS-ECC-P384-Root-G5        mkcert.org/DigiCert-Global-Root-G2      ntfy.sh/ISRG-Root-X1    www.dshield.org/GTS-Root-R4     www.spamhaus.org/GTS-Root-R4
-
+1.1.1.1/SSL-com-Root-Certification-Authority-ECC.pem
+8.8.8.8/GTS-Root-RX.pem
+9.9.9.9/DigiCert-Global-Root-G3.pem
+api.mullvad.net/ISRG-Root-X1.pem
+ipv4.showipv6.de/ISRG-Root-X1.pem
+ipv4.tunnelbroker.net/Starfield-Root-Certificate-Authority-G2.pem
+mkcert.org/ISRG-Root-X1.pem
+mkcert.org/DigiCert-Global-Root-G3.pem
+mkcert.org/DigiCert-TLS-RSA4096-Root-G5.pem
+mkcert.org/DigiCert-TLS-ECC-P384-Root-G5.pem
+mkcert.org/DigiCert-Global-Root-G2.pem
+ntfy.sh/ISRG-Root-X1.pem
+www.dshield.org/GTS-Root-R4.pem
+www.spamhaus.org/GTS-Root-R4.pem