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

index 2e5446ebe836fb4fff760dbaf899ffc15a6c65d9..2c6a7decc5502a4a7927b47e25f851d0e97d39ba 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/393/5cbfc3df";
+:global CommitId "main/394/a954404f";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:35:02 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 23:30:02 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
index 102bf78a83ba916eb05c54c35a2659eb51a24b9e..8841c89bf9cdc228b221bb28425f951f84bb5a51 100644 (file)
@@ -1,14 +1,25 @@
 # Makefile to check certificates
+#SHELL=                /bin/sh
 
-NOIPV6 = true
+DIR_CURRENT := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+PWD_DIR       = $(shell pwd)
 
-CURL = curl \
-       --capath /dev/null \
-       --connect-timeout 5 \
-       --output /dev/null \
+GLOB_ROOT_CA = https://curl.se/ca/cacert.pem
+FETCH_CMD = curl -s -o
+
+#CONTRIB?=     ../contrib
+#CONTRIB:=     $(abspath $(CONTRIB))
+#SHELL := /bin/bash
+#CURL = curl \
+#      --capath /dev/null \
+#      --connect-timeout 5 \
+#      --output /dev/null \
 #      --silent
 #      --verbose
 
+NOIPV4 ?= false
+NOIPV6 ?= false
+
 DOMAINS_DUAL = \
        api.macvendors.com/GTS-Root-R4 \
        api.telegram.org/Go-Daddy-Root-Certificate-Authority-G2 \
@@ -41,9 +52,30 @@ DOMAINS_IPV6 = \
        [2620\:fe\:\:9]/DigiCert-Global-Root-G3 \
        ipv6.showipv6.de/ISRG-Root-X1
 
-.PHONY: $(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+.PHONY: 
+#$(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+
+default:
+help:
+    @{ \
+                echo "Usage: make [target]"; \
+                echo "Targets:"; \
+                echo "  all: Check all certificates (DUAL, IPV4, IPV6)"; \
+                echo "  dual: Check certificates for DUAL domains"; \
+                echo "  ipv4: Check certificates for IPV4 domains"; \
+                echo "  ipv6: Check certificates for IPV6 domains"; \
+                echo "  help: Show this help message\n"; \
+                echo "Environment variables:"; \
+                echo "  NOIPV4: Set to true to skip IPv4 checks"; \
+                echo "  NOIPV6: Set to true to skip IPv6 checks\n"; \
+                echo "Examples:"; \
+                echo "  make all NOIPV6=true"; \
+                echo "  make dual NOIPV4=true"; \
+       }
+
+dual: $(DOMAINS_DUAL)
 
-all: $(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+#$(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
 
 $(DOMAINS_DUAL):
 ifndef NOIPV4