From 35dcbf443eb1ad9ab7b6e068c530d0c8744c62c0 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 1 May 2026 23:30:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 23:30:02 01.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/certs/Makefile | 46 +++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 2e5446ebe..2c6a7decc 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/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; diff --git a/html/certs/Makefile b/html/certs/Makefile index 102bf78a8..8841c89bf 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -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 -- 2.52.0