From c84a864010c050da141fab84a1478110ee34b834 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Wed, 15 Apr 2026 22:25:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:25:02 15.04.2026. --- html/.#AM-DOHCert.rsc | 1 + html/{AM-DOHCerts.rsc => AM-DOHCert.rsc} | 22 +++++++++++----------- html/AM-GlobalFunc.rsc | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) create mode 120000 html/.#AM-DOHCert.rsc rename html/{AM-DOHCerts.rsc => AM-DOHCert.rsc} (77%) diff --git a/html/.#AM-DOHCert.rsc b/html/.#AM-DOHCert.rsc new file mode 120000 index 000000000..32db5e2e4 --- /dev/null +++ b/html/.#AM-DOHCert.rsc @@ -0,0 +1 @@ +root@amster.2489974 \ No newline at end of file diff --git a/html/AM-DOHCerts.rsc b/html/AM-DOHCert.rsc similarity index 77% rename from html/AM-DOHCerts.rsc rename to html/AM-DOHCert.rsc index 0045a655a..d78375e5d 100644 --- a/html/AM-DOHCerts.rsc +++ b/html/AM-DOHCert.rsc @@ -32,10 +32,10 @@ ############################################### /system scheduler; -:if ([:len [find name="update-doh-ca"]] = 0) do={ - add name="update-doh-ca" \ +:if ([:len [find name="AM-DOHCert"]] = 0) do={ + add name="AM-DOHCert" \ interval=2w \ - on-event="/import 12a-dns-doh-ca.rsc" \ + on-event="/import AM-DOHCert.rsc" \ start-time=03:00:00 \ comment="Auto-update Cloudflare Root CA for DoH"; } @@ -45,29 +45,29 @@ ############################################### # Cloudflare Root CA Certificate Update ############################################### +:local CfCaURL "https://developers.cloudflare.com/ssl/static/origin_ca_ecc_root.pem"; -:local CF_CA_URL "https://developers.cloudflare.com/ssl/static/origin_ca_ecc_root.pem"; -:local CF_CA_FILE "cloudflare-root.pem"; +:local CfCaFile "cloudflare-root.pem"; # Remove old certificate file /file; -:if ([:len [find name=$CF_CA_FILE]] > 0) do={ - remove $CF_CA_FILE; +:if ([:len [find name=$CfCaFile]] > 0) do={ + remove $CfCaFile; } # Download CA certificate /tool fetch \ - url=$CF_CA_URL \ - dst-path=$CF_CA_FILE \ + url=$CfCaURL \ + dst-path=$CfCaFile \ keep-result=yes; :delay 2s; # Import certificate /certificate; -import file-name=$CF_CA_FILE passphrase=""; +import file-name=$CfCaFile passphrase=""; -:log info "Cloudflare DoH Root CA updated from $CF_CA_URL"; +:log info "Cloudflare DoH Root CA updated from $CfCaURL"; } do={ :global ExitError; $ExitError $ExitOK [ :jobname ] $Err; diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 4db3a5498..c27956f5b 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/234/a0b1eabb"; +:global CommitId "main/235/5c1c0b00"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:10:02 15.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:25:02 15.04.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0