From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Wed, 18 Mar 2026 01:25:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:25:02 18.03.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=3419e47d5634e55f498bb57b2521403c03faaa70;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:25:02 18.03.2026. --- diff --git a/.editorconfig b/.editorconfig index 53a3d65a4..28f493897 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: MIT OR CC0-1.0 -# SPDX-FileCopyrightText: 2021 Johannes Siipola - [*] end_of_line = lf insert_final_newline = true diff --git a/html/.editorconfig b/html/.editorconfig index 53a3d65a4..28f493897 100644 --- a/html/.editorconfig +++ b/html/.editorconfig @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: MIT OR CC0-1.0 -# SPDX-FileCopyrightText: 2021 Johannes Siipola - [*] end_of_line = lf insert_final_newline = true diff --git a/html/.gitignore b/html/.gitignore index 2d9c1718e..a1f754a28 100644 --- a/html/.gitignore +++ b/html/.gitignore @@ -5,5 +5,6 @@ *.orig *.patch *.rej +.editorconfig tmp/checksums.json diff --git a/html/AM-GlobalConfig.rsc b/html/AM-GlobalConfig.rsc index 8db709657..7aa06f5c8 100644 --- a/html/AM-GlobalConfig.rsc +++ b/html/AM-GlobalConfig.rsc @@ -1,153 +1,153 @@ -#!rsc by Vados -# RouterOS script: AM-GlobalConfig -# Script comment: Global Config Script -# Copyright (c) 2007-2026 Vados -# -# -# Warning: Dont touch this line! -:global GlobalConfReady false; -# -# -# Global Url For Amster scripts to fetch -# most be defined in AM-Init-Script or AM-setup scripts -:global GlobalScriptsUrl "https://ros.vados.ru/"; -:global ScriptsUrlSuffix ""; -:global CheckSumsVerify true; - -:global ScriptUpdatesCRLF true; -:global CommentsInScripts true; - -# Debug output: -:global PrintDebug true; #false; - -# Debug output for specific script: -:set ($PrintDebugOverride->"AM-GlobalFunc") true; - -# Debug logs -# Other actions (disk, email, remote or support) can be used as well. -# I do not recommend using echo - use debug output instead (https://rsc.eworm.de/main/DEBUG.html#debug-output). -#/system/logging/add topics=script,debug action=memory; - -:global MikrotikUpgradeUrl "https://upgrade.mikrotik.com/routeros"; -:global Domain "WORKGROUP"; - -:global EmailGeneralTo "vados@vados.ru"; -#:global EmailGeneralCc ""; - -# $ScriptInstallUpdate mod/notification-telegram -:global TelegramTokenId "8390868324:AAG3_d1hfVR2M6pGAgDK6ZvhOe4J97nyopw"; -:global TelegramChatId "-1003631309063"; #"454403445"; -# Use this to send notifications to a specific topic in group. -#:global TelegramThreadId "30"; -# Using telegram-chat you have to define trusted chat ids (not group ids!) -# or user names. Groups allow to chat with devices simultaneously. -:global TelegramChatIdsTrusted { - "454403445" - "-1003631309063" - "-5124482807" - "1087968824"; -}; -# "-5294757340"; - -:global TelegramChatGroups "(all)"; -#:global TelegramChatGroups "(all|home|office)"; - -:global NotificationFunctions { - "email" - "telegram"; -}; -# Toggle this to disable symbols in notifications. -:global NotificationsWithSymbols true; -:global TerminalColorOutput true; - -:global DetectIpAddrDefault "https://ipv4.mikrotik.ovh/"; -:global DetectIpAddrFallback "https://api.ipify.org/"; - -## Update channel. Possible values: stable, long-term, testing, development -:global updateChannel "stable"; - -# Script BackupAndUpdate mode, possible values: backup, -# updateOnce - Update once as "osnotify" and back "osnotify" mode (in terminal run :set OSUpdateMode updateOnce; $OSUpdateMode;). -# osupdate - Update if available and creates backups before/after update (ignores `forceBackup`) -# Set `forceBackup` to true to always create backups, even without updates -# osnotify - Set `forceBackup` to always create backups on every run -:global DevInfoIncludeIP true; -:global BackupAndUpdateMode "osnotify" - -:global forceBackup true; -:global BackupPassword "Peskar55"; - -# SFTP Backup Variables -:global BackupRandomDelay 0; -:global BackupUploadUrl "sftp://amster.vados.ru/upload/"; -:global BackupUploadUser $Identity; -:global BackupUploadPass "root.mnuc.backuper"; - -:global BackupSendBinary true; -:global BackupSendExport true; -:global BackupSendGlobalConfig true; -:global BackupSendScripts true; - -# Remove local file after uploading if no errors -:global BackupRmLocal true; - -# Local Backups Root Directory -:global BackupLocalRoot "tmpfs"; - -# Encrypt Backup -:global BackupEncrypt true; - -# Sensitive information in Backups -:global BackupSens true; - -# User Export -:global BackupUser true; - -# License Export (not for CHR, will silently skip) -:global BackupLicense false; - -# SSH Keys -:global BackupSshKeys true; - -# Certificate Export -:global BackupCerts true; - -# Certificate Password -:global BackupCertsPasswd ""; - -# User-Manager Export -:global BackupUserMan false; - -# The Dude Export -:global BackupDude false; - -# User Files to export, comma-separated string or array of strings -# User Files are not removed on backup -# Any directory paths will be removed (/ -> _) on remote file -# Nonpresent files are silently skipped -:global BackupUserList "autosupout.rif,autosupout.old.rif"; - -# load functions and any custom scripts -# [ /system/script/find where name="global-config-overlay" ], \ -# [ /system/script/find where name~"^global-config-overlay\\.d/." ] -# -#:foreach Script in=([ /system/script/find where name="Amster-TGglobalVars" ], [ /system/script/find where name="Amster-TGglobalFunc" ]) do={ -# :onerror Err { -# /system/script/run $Script; -# } do={ -# :log error ("Loading configuration from configs and functions" . [ /system/script/get $Script name ] . " failed: " . $Err); -# } -#} -#:log info "\ndevMode = $devMode"; -#:log info "\ndevRunning = $devRunning"; -:foreach Script in=[ /system/script/find where source~"^#!rsc by Vados GlobalRUN\r?\n" ] do={ - :onerror Err { - /system/script/run $Script; - } do={ - :log error ("Run script " . [ /system/script/get $Script name ] . " width marker \" GlobalRUN\" failed: " . $Err); - } -} - -# signal we are ready -:set GlobalConfReady true; -:while ($GlobalConfReady != true) do={:delay 500ms}; +#!rsc by Vados +# RouterOS script: AM-GlobalConfig +# Script comment: Global Config Script +# Copyright (c) 2007-2026 Vados +# +# +# Warning: Dont touch this line! +:global GlobalConfReady false; +# +# +# Global Url For Amster scripts to fetch +# most be defined in AM-Init-Script or AM-setup scripts +:global GlobalScriptsUrl "https://ros.vados.ru/"; +:global ScriptsUrlSuffix ""; +:global CheckSumsVerify true; + +:global ScriptUpdatesCRLF true; +:global CommentsInScripts true; + +# Debug output: +:global PrintDebug true; #false; + +# Debug output for specific script: +:set ($PrintDebugOverride->"AM-GlobalFunc") true; + +# Debug logs +# Other actions (disk, email, remote or support) can be used as well. +# I do not recommend using echo - use debug output instead (https://rsc.eworm.de/main/DEBUG.html#debug-output). +#/system/logging/add topics=script,debug action=memory; + +:global MikrotikUpgradeUrl "https://upgrade.mikrotik.com/routeros"; +:global Domain "WORKGROUP"; + +:global EmailGeneralTo "vados@vados.ru"; +#:global EmailGeneralCc ""; + +# $ScriptInstallUpdate mod/notification-telegram +:global TelegramTokenId "8390868324:AAG3_d1hfVR2M6pGAgDK6ZvhOe4J97nyopw"; +:global TelegramChatId "-1003631309063"; #"454403445"; +# Use this to send notifications to a specific topic in group. +#:global TelegramThreadId "30"; +# Using telegram-chat you have to define trusted chat ids (not group ids!) +# or user names. Groups allow to chat with devices simultaneously. +:global TelegramChatIdsTrusted { + "454403445" + "-1003631309063" + "-5124482807" + "1087968824"; +}; +# "-5294757340"; + +:global TelegramChatGroups "(all)"; +#:global TelegramChatGroups "(all|home|office)"; + +:global NotificationFunctions { + "email" + "telegram"; +}; +# Toggle this to disable symbols in notifications. +:global NotificationsWithSymbols true; +:global TerminalColorOutput true; + +:global DetectIpAddrDefault "https://ipv4.mikrotik.ovh/"; +:global DetectIpAddrFallback "https://api.ipify.org/"; + +## Update channel. Possible values: stable, long-term, testing, development +:global updateChannel "stable"; + +# Script BackupAndUpdate mode, possible values: backup, +# updateOnce - Update once as "osnotify" and back "osnotify" mode (in terminal run :set OSUpdateMode updateOnce; $OSUpdateMode;). +# osupdate - Update if available and creates backups before/after update (ignores `forceBackup`) +# Set `forceBackup` to true to always create backups, even without updates +# osnotify - Set `forceBackup` to always create backups on every run +:global DevInfoIncludeIP true; +:global BackupAndUpdateMode "osnotify" + +:global forceBackup true; +:global BackupPassword "Peskar55"; + +# SFTP Backup Variables +:global BackupRandomDelay 0; +:global BackupUploadUrl "sftp://amster.vados.ru/upload/"; +:global BackupUploadUser $Identity; +:global BackupUploadPass "root.mnuc.backuper"; + +:global BackupSendBinary true; +:global BackupSendExport true; +:global BackupSendGlobalConfig true; +:global BackupSendScripts true; + +# Remove local file after uploading if no errors +:global BackupRmLocal true; + +# Local Backups Root Directory +:global BackupLocalRoot "tmpfs"; + +# Encrypt Backup +:global BackupEncrypt true; + +# Sensitive information in Backups +:global BackupSens true; + +# User Export +:global BackupUser true; + +# License Export (not for CHR, will silently skip) +:global BackupLicense false; + +# SSH Keys +:global BackupSshKeys true; + +# Certificate Export +:global BackupCerts true; + +# Certificate Password +:global BackupCertsPasswd ""; + +# User-Manager Export +:global BackupUserMan false; + +# The Dude Export +:global BackupDude false; + +# User Files to export, comma-separated string or array of strings +# User Files are not removed on backup +# Any directory paths will be removed (/ -> _) on remote file +# Nonpresent files are silently skipped +:global BackupUserList "autosupout.rif,autosupout.old.rif"; + +# load functions and any custom scripts +# [ /system/script/find where name="global-config-overlay" ], \ +# [ /system/script/find where name~"^global-config-overlay\\.d/." ] +# +#:foreach Script in=([ /system/script/find where name="Amster-TGglobalVars" ], [ /system/script/find where name="Amster-TGglobalFunc" ]) do={ +# :onerror Err { +# /system/script/run $Script; +# } do={ +# :log error ("Loading configuration from configs and functions" . [ /system/script/get $Script name ] . " failed: " . $Err); +# } +#} +#:log info "\ndevMode = $devMode"; +#:log info "\ndevRunning = $devRunning"; +:foreach Script in=[ /system/script/find where source~"^#!rsc by Vados GlobalRUN\r?\n" ] do={ + :onerror Err { + /system/script/run $Script; + } do={ + :log error ("Run script " . [ /system/script/get $Script name ] . " width marker \" GlobalRUN\" failed: " . $Err); + } +} + +# signal we are ready +:set GlobalConfReady true; +:while ($GlobalConfReady != true) do={:delay 500ms}; diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 3978eae77..c091675ae 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -16,9 +16,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/194/31f4133f"; +:global CommitId "main/195/894e3844"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:20:03 18.03.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:25:02 18.03.2026."; # The variables are received right here. :global GlobalConfVersion 138;