]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:25:02 15.04.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Wed, 15 Apr 2026 19:25:03 +0000 (22:25 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Wed, 15 Apr 2026 19:25:03 +0000 (22:25 +0300)
html/.#AM-DOHCert.rsc [new symlink]
html/AM-DOHCert.rsc [moved from html/AM-DOHCerts.rsc with 77% similarity]
html/AM-GlobalFunc.rsc

diff --git a/html/.#AM-DOHCert.rsc b/html/.#AM-DOHCert.rsc
new file mode 120000 (symlink)
index 0000000..32db5e2
--- /dev/null
@@ -0,0 +1 @@
+root@amster.2489974
\ No newline at end of file
similarity index 77%
rename from html/AM-DOHCerts.rsc
rename to html/AM-DOHCert.rsc
index 0045a655a42049a36937d91634e385813e5d98f5..d78375e5df0442d2fcee56c2155af5c07c69ce19 100644 (file)
 ###############################################
 
 /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";
 }
 ###############################################
 # 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;
index 4db3a5498ec4b87fff3d6b21fe845c540a6d61f6..c27956f5bb8291c313d665a065d6d490ae3bd442 100644 (file)
@@ -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;