Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ab2418a5f | ||
|
|
63aa9d424b |
@@ -4,3 +4,4 @@ dist/
|
||||
*.db-shm
|
||||
*.db-wal
|
||||
.env
|
||||
storage/backups/
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import Database from "better-sqlite3"
|
||||
import { existsSync, readFileSync } from "node:fs"
|
||||
import path from "node:path"
|
||||
|
||||
type SqliteHandle = InstanceType<typeof Database>
|
||||
import { drizzle } from "drizzle-orm/better-sqlite3"
|
||||
@@ -391,6 +393,19 @@ CREATE TABLE IF NOT EXISTS backup_schedule_settings (
|
||||
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS backup_entries (
|
||||
id TEXT PRIMARY KEY,
|
||||
server_id TEXT NOT NULL,
|
||||
server_name TEXT NOT NULL,
|
||||
filename TEXT NOT NULL,
|
||||
size_bytes INTEGER NOT NULL,
|
||||
kind TEXT NOT NULL DEFAULT 'manual',
|
||||
notes TEXT,
|
||||
created_at TEXT NOT NULL
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_backup_entries_server_created ON backup_entries(server_id, created_at);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_backup_entries_filename ON backup_entries(filename);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS alert_rules (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
@@ -669,6 +684,41 @@ SELECT 1, NULL
|
||||
WHERE NOT EXISTS (SELECT 1 FROM alert_engine_cursor WHERE id = 1);
|
||||
`)
|
||||
|
||||
const backupEntryCount = sqlite.prepare(`SELECT COUNT(*) AS c FROM backup_entries`).get() as { c: number }
|
||||
if (backupEntryCount.c === 0) {
|
||||
const legacyIndexPath = path.resolve(process.cwd(), "storage", "backups", "index.json")
|
||||
if (existsSync(legacyIndexPath)) {
|
||||
try {
|
||||
const parsed = JSON.parse(readFileSync(legacyIndexPath, "utf8")) as unknown
|
||||
if (Array.isArray(parsed)) {
|
||||
const insert = sqlite.prepare(`
|
||||
INSERT OR IGNORE INTO backup_entries (id, server_id, server_name, filename, size_bytes, kind, notes, created_at)
|
||||
VALUES (@id, @serverId, @serverName, @filename, @sizeBytes, @kind, @notes, @createdAt)
|
||||
`)
|
||||
for (const row of parsed) {
|
||||
if (!row || typeof row !== "object") continue
|
||||
const item = row as Record<string, unknown>
|
||||
const id = String(item.id ?? "").trim()
|
||||
const filename = String(item.filename ?? "").trim()
|
||||
if (!id || !filename) continue
|
||||
insert.run({
|
||||
id,
|
||||
serverId: String(item.serverId ?? ""),
|
||||
serverName: String(item.serverName ?? ""),
|
||||
filename,
|
||||
sizeBytes: Number(item.sizeBytes ?? 0) || 0,
|
||||
kind: item.kind === "auto" ? "auto" : "manual",
|
||||
notes: item.notes == null ? null : String(item.notes),
|
||||
createdAt: String(item.createdAt ?? new Date().toISOString()),
|
||||
})
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
/* legacy index.json не читается — пропускаем */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const db = drizzle(sqlite, { schema })
|
||||
|
||||
/** Прямой доступ к better-sqlite3 для сложных read-only запросов (напр. /api/alerts). */
|
||||
|
||||
@@ -340,6 +340,17 @@ export const backupScheduleSettings = sqliteTable("backup_schedule_settings", {
|
||||
updatedAt: text("updated_at").notNull().default(sql`(datetime('now'))`),
|
||||
})
|
||||
|
||||
export const backupEntries = sqliteTable("backup_entries", {
|
||||
id: text("id").primaryKey(),
|
||||
serverId: text("server_id").notNull(),
|
||||
serverName: text("server_name").notNull(),
|
||||
filename: text("filename").notNull(),
|
||||
sizeBytes: integer("size_bytes").notNull(),
|
||||
kind: text("kind", { enum: ["manual", "auto"] }).notNull().default("manual"),
|
||||
notes: text("notes"),
|
||||
createdAt: text("created_at").notNull(),
|
||||
})
|
||||
|
||||
/** Группы правил: ANY = хотя бы одно; ALL = все одновременно в окне тика. */
|
||||
export const alertGroups = sqliteTable("alert_groups", {
|
||||
id: text("id").primaryKey(),
|
||||
@@ -562,6 +573,7 @@ export type AcmeSettingsRow = typeof acmeSettings.$inferSelect
|
||||
export type CertificateIssueJobRow = typeof certificateIssueJobs.$inferSelect
|
||||
export type CertificateRenewSettingsRow = typeof certificateRenewSettings.$inferSelect
|
||||
export type BackupScheduleSettingsRow = typeof backupScheduleSettings.$inferSelect
|
||||
export type BackupEntryRow = typeof backupEntries.$inferSelect
|
||||
export type AlertGroupRow = typeof alertGroups.$inferSelect
|
||||
export type AlertRuleRow = typeof alertRules.$inferSelect
|
||||
export type AlertRuleTargetRow = typeof alertRuleTargets.$inferSelect
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { randomUUID } from "node:crypto"
|
||||
import { readFile, rm } from "node:fs/promises"
|
||||
import { readFile } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import { z } from "zod"
|
||||
import type { FastifyPluginAsyncZod } from "@fastify/type-provider-zod"
|
||||
@@ -8,12 +8,13 @@ import { listServersRead } from "../modules/servers/service/servers-service.js"
|
||||
import { appendEvent } from "../modules/events/service/events-service.js"
|
||||
import { refreshScheduler } from "../services/scheduler.js"
|
||||
import {
|
||||
deleteBackupRecord,
|
||||
getBackupById,
|
||||
getBackupsDir,
|
||||
getBackupScheduleSettings,
|
||||
readBackupIndex,
|
||||
listBackups,
|
||||
runBackupForServer,
|
||||
updateBackupScheduleSettings,
|
||||
writeBackupIndex,
|
||||
type BackupMeta,
|
||||
} from "../services/backup-service.js"
|
||||
|
||||
@@ -47,11 +48,9 @@ const BackupJobIdParamSchema = z.object({
|
||||
async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
|
||||
job.status = "running"
|
||||
job.startedAt = new Date().toISOString()
|
||||
const indexRows = await readBackupIndex()
|
||||
for (const id of ids) {
|
||||
try {
|
||||
const meta = await runBackupForServer(id, "manual", notes)
|
||||
indexRows.unshift(meta)
|
||||
job.created.push(meta)
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : String(err)
|
||||
@@ -60,7 +59,6 @@ async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
|
||||
job.completed += 1
|
||||
}
|
||||
}
|
||||
await writeBackupIndex(indexRows)
|
||||
job.status = "done"
|
||||
job.finishedAt = new Date().toISOString()
|
||||
appendEvent({
|
||||
@@ -82,9 +80,7 @@ async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
|
||||
|
||||
const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
|
||||
app.get("/backups", async (_req, reply) => {
|
||||
const rows = await readBackupIndex()
|
||||
rows.sort((a, b) => b.createdAt.localeCompare(a.createdAt))
|
||||
return reply.send(rows)
|
||||
return reply.send(listBackups())
|
||||
})
|
||||
|
||||
app.get("/backups/schedule", async (_req, reply) => {
|
||||
@@ -171,8 +167,7 @@ const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
|
||||
})
|
||||
|
||||
app.get("/backups/:id/download", { schema: { params: BackupIdParamSchema } }, async (req, reply) => {
|
||||
const rows = await readBackupIndex()
|
||||
const hit = rows.find((r) => r.id === req.params.id)
|
||||
const hit = getBackupById(req.params.id)
|
||||
if (!hit) return reply.status(404).send({ error: "Бэкап не найден" })
|
||||
const filePath = path.join(getBackupsDir(), hit.filename)
|
||||
const content = await readFile(filePath, "utf8").catch(() => null)
|
||||
@@ -183,12 +178,8 @@ const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
|
||||
})
|
||||
|
||||
app.delete("/backups/:id", { schema: { params: BackupIdParamSchema } }, async (req, reply) => {
|
||||
const rows = await readBackupIndex()
|
||||
const idx = rows.findIndex((r) => r.id === req.params.id)
|
||||
if (idx < 0) return reply.status(404).send({ error: "Бэкап не найден" })
|
||||
const [hit] = rows.splice(idx, 1)
|
||||
await writeBackupIndex(rows)
|
||||
await rm(path.join(getBackupsDir(), hit.filename), { force: true })
|
||||
const hit = await deleteBackupRecord(req.params.id)
|
||||
if (!hit) return reply.status(404).send({ error: "Бэкап не найден" })
|
||||
return reply.status(204).send()
|
||||
})
|
||||
}
|
||||
|
||||
@@ -5,11 +5,9 @@ import {
|
||||
getBackupScheduleSettings,
|
||||
isBackupDue,
|
||||
pruneBackupsForServer,
|
||||
readBackupIndex,
|
||||
resolveBackupServerIds,
|
||||
runBackupForServer,
|
||||
touchBackupScheduleRunMeta,
|
||||
writeBackupIndex,
|
||||
} from "./backup-service.js"
|
||||
|
||||
let collecting = false
|
||||
@@ -62,7 +60,6 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
|
||||
collecting = true
|
||||
const started = Date.now()
|
||||
const serverIds = resolveBackupServerIds(settings)
|
||||
const indexRows = await readBackupIndex()
|
||||
|
||||
appendEvent({
|
||||
level: "info",
|
||||
@@ -78,8 +75,7 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
|
||||
try {
|
||||
for (const id of serverIds) {
|
||||
try {
|
||||
const meta = await runBackupForServer(id, "auto")
|
||||
indexRows.unshift(meta)
|
||||
await runBackupForServer(id, "auto")
|
||||
snapshot.created += 1
|
||||
} catch (e) {
|
||||
const message = e instanceof Error ? e.message : String(e)
|
||||
@@ -88,8 +84,6 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
|
||||
}
|
||||
}
|
||||
|
||||
await writeBackupIndex(indexRows)
|
||||
|
||||
for (const id of serverIds) {
|
||||
snapshot.pruned += await pruneBackupsForServer(id, settings.keepCount)
|
||||
}
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
import { randomUUID } from "node:crypto"
|
||||
import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises"
|
||||
import { mkdir, rm, stat, writeFile } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { desc, eq } from "drizzle-orm"
|
||||
import type { BackupScheduleSettingsDto } from "@mmapp/contracts/backups"
|
||||
import { db } from "../db/index.js"
|
||||
import { backupScheduleSettings } from "../db/schema.js"
|
||||
import { backupEntries, backupScheduleSettings } from "../db/schema.js"
|
||||
import { getServerRowById } from "../modules/servers/repository/servers-repository.js"
|
||||
import { listServersRead } from "../modules/servers/service/servers-service.js"
|
||||
import { MikrotikClient } from "./mikrotik.js"
|
||||
|
||||
const SETTINGS_ID = 1
|
||||
const BACKUPS_DIR = path.resolve(process.cwd(), "storage", "backups")
|
||||
const INDEX_PATH = path.join(BACKUPS_DIR, "index.json")
|
||||
|
||||
export type BackupMeta = {
|
||||
id: string
|
||||
@@ -24,25 +23,51 @@ export type BackupMeta = {
|
||||
notes?: string
|
||||
}
|
||||
|
||||
function rowToMeta(row: typeof backupEntries.$inferSelect): BackupMeta {
|
||||
return {
|
||||
id: row.id,
|
||||
serverId: row.serverId,
|
||||
serverName: row.serverName,
|
||||
filename: row.filename,
|
||||
sizeBytes: row.sizeBytes,
|
||||
createdAt: row.createdAt,
|
||||
kind: row.kind,
|
||||
notes: row.notes ?? undefined,
|
||||
}
|
||||
}
|
||||
|
||||
export async function ensureBackupStorage(): Promise<void> {
|
||||
await mkdir(BACKUPS_DIR, { recursive: true })
|
||||
}
|
||||
|
||||
export async function readBackupIndex(): Promise<BackupMeta[]> {
|
||||
await ensureBackupStorage()
|
||||
try {
|
||||
const raw = await readFile(INDEX_PATH, "utf8")
|
||||
const parsed = JSON.parse(raw) as unknown
|
||||
if (!Array.isArray(parsed)) return []
|
||||
return parsed as BackupMeta[]
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
export function listBackups(): BackupMeta[] {
|
||||
return db.select().from(backupEntries).orderBy(desc(backupEntries.createdAt)).all().map(rowToMeta)
|
||||
}
|
||||
|
||||
export async function writeBackupIndex(rows: BackupMeta[]): Promise<void> {
|
||||
await ensureBackupStorage()
|
||||
await writeFile(INDEX_PATH, JSON.stringify(rows, null, 2), "utf8")
|
||||
export function getBackupById(id: string): BackupMeta | null {
|
||||
const row = db.select().from(backupEntries).where(eq(backupEntries.id, id)).limit(1).all()[0]
|
||||
return row ? rowToMeta(row) : null
|
||||
}
|
||||
|
||||
export function insertBackup(meta: BackupMeta): void {
|
||||
db.insert(backupEntries).values({
|
||||
id: meta.id,
|
||||
serverId: meta.serverId,
|
||||
serverName: meta.serverName,
|
||||
filename: meta.filename,
|
||||
sizeBytes: meta.sizeBytes,
|
||||
kind: meta.kind,
|
||||
notes: meta.notes ?? null,
|
||||
createdAt: meta.createdAt,
|
||||
}).run()
|
||||
}
|
||||
|
||||
export async function deleteBackupRecord(id: string): Promise<BackupMeta | null> {
|
||||
const hit = getBackupById(id)
|
||||
if (!hit) return null
|
||||
db.delete(backupEntries).where(eq(backupEntries.id, id)).run()
|
||||
await rm(path.join(BACKUPS_DIR, hit.filename), { force: true })
|
||||
return hit
|
||||
}
|
||||
|
||||
function fmtTs(d = new Date()): string {
|
||||
@@ -152,7 +177,22 @@ export function resolveBackupServerIds(settings: BackupScheduleSettingsDto): str
|
||||
return [...new Set(requested)].filter((id) => enabled.has(id))
|
||||
}
|
||||
|
||||
function sameLocalSlot(a: Date, b: Date): boolean {
|
||||
function scheduledSlotForDate(now: Date, settings: BackupScheduleSettingsDto): Date | null {
|
||||
if (settings.frequency === "weekly") {
|
||||
const currentDow = (now.getDay() + 6) % 7
|
||||
if (currentDow !== settings.weekDay) return null
|
||||
} else if (settings.frequency === "monthly") {
|
||||
if (now.getDate() !== settings.monthDay) return null
|
||||
}
|
||||
|
||||
const slot = new Date(now)
|
||||
slot.setSeconds(0, 0)
|
||||
slot.setMilliseconds(0)
|
||||
slot.setHours(settings.hour, settings.minute, 0, 0)
|
||||
return slot
|
||||
}
|
||||
|
||||
function sameLocalMinute(a: Date, b: Date): boolean {
|
||||
return a.getFullYear() === b.getFullYear()
|
||||
&& a.getMonth() === b.getMonth()
|
||||
&& a.getDate() === b.getDate()
|
||||
@@ -160,27 +200,21 @@ function sameLocalSlot(a: Date, b: Date): boolean {
|
||||
&& a.getMinutes() === b.getMinutes()
|
||||
}
|
||||
|
||||
/** Срабатывает только в минуту расписания; 60 с в UI — интервал проверки, не частота бэкапа. */
|
||||
export function isBackupDue(now: Date, settings: BackupScheduleSettingsDto, lastRunAt: string | null | undefined): boolean {
|
||||
if (!settings.enabled) return false
|
||||
const slot = new Date(now)
|
||||
slot.setSeconds(0, 0)
|
||||
slot.setHours(settings.hour, settings.minute, 0, 0)
|
||||
|
||||
if (settings.frequency === "weekly") {
|
||||
const currentDow = (now.getDay() + 6) % 7
|
||||
if (currentDow !== settings.weekDay) return false
|
||||
} else if (settings.frequency === "monthly") {
|
||||
if (now.getDate() !== settings.monthDay) return false
|
||||
}
|
||||
|
||||
const slot = scheduledSlotForDate(now, settings)
|
||||
if (!slot) return false
|
||||
if (now < slot) return false
|
||||
if (!sameLocalMinute(now, slot)) return false
|
||||
|
||||
if (lastRunAt) {
|
||||
const prev = new Date(lastRunAt)
|
||||
if (Number.isNaN(prev.getTime())) return true
|
||||
if (settings.frequency === "daily" && sameLocalSlot(prev, slot)) return false
|
||||
if (settings.frequency === "weekly" && sameLocalSlot(prev, slot)) return false
|
||||
if (settings.frequency === "monthly" && prev.getFullYear() === slot.getFullYear() && prev.getMonth() === slot.getMonth() && prev.getDate() === slot.getDate()) return false
|
||||
if (sameLocalMinute(prev, slot)) return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -203,9 +237,10 @@ export async function runBackupForServer(
|
||||
const safeServer = row.name.replace(/[^a-zA-Z0-9._-]+/g, "_")
|
||||
const filename = `${safeServer}_${ts}.rsc`
|
||||
const filePath = path.join(BACKUPS_DIR, filename)
|
||||
await ensureBackupStorage()
|
||||
await writeFile(filePath, script, "utf8")
|
||||
const st = await stat(filePath)
|
||||
return {
|
||||
const meta: BackupMeta = {
|
||||
id: randomUUID(),
|
||||
serverId: String(row.id),
|
||||
serverName: row.name,
|
||||
@@ -215,27 +250,24 @@ export async function runBackupForServer(
|
||||
kind,
|
||||
notes,
|
||||
}
|
||||
insertBackup(meta)
|
||||
return meta
|
||||
}
|
||||
|
||||
export async function pruneBackupsForServer(serverId: string, keepCount: number): Promise<number> {
|
||||
const rows = await readBackupIndex()
|
||||
const forServer = rows.filter((r) => r.serverId === serverId)
|
||||
if (forServer.length <= keepCount) return 0
|
||||
const sorted = [...forServer].sort((a, b) => b.createdAt.localeCompare(a.createdAt))
|
||||
const toDelete = sorted.slice(keepCount)
|
||||
const deleteIds = new Set(toDelete.map((r) => r.id))
|
||||
const rows = db.select().from(backupEntries)
|
||||
.where(eq(backupEntries.serverId, serverId))
|
||||
.orderBy(desc(backupEntries.createdAt))
|
||||
.all()
|
||||
if (rows.length <= keepCount) return 0
|
||||
const toDelete = rows.slice(keepCount)
|
||||
for (const hit of toDelete) {
|
||||
db.delete(backupEntries).where(eq(backupEntries.id, hit.id)).run()
|
||||
await rm(path.join(BACKUPS_DIR, hit.filename), { force: true })
|
||||
}
|
||||
const next = rows.filter((r) => !deleteIds.has(r.id))
|
||||
await writeBackupIndex(next)
|
||||
return toDelete.length
|
||||
}
|
||||
|
||||
export function getBackupsDir(): string {
|
||||
return BACKUPS_DIR
|
||||
}
|
||||
|
||||
export function getBackupIndexPath(): string {
|
||||
return INDEX_PATH
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,201 +0,0 @@
|
||||
[
|
||||
{
|
||||
"id": "bec5c501-6d3f-4921-9774-5f0e3d526d87",
|
||||
"serverId": "6",
|
||||
"serverName": "ihor.msk.rt.shx.su",
|
||||
"filename": "ihor.msk.rt.shx.su_2026-05-12_21-45-18.rsc",
|
||||
"sizeBytes": 711251,
|
||||
"createdAt": "2026-05-12T14:45:18.144Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "2c1d9c24-b612-4756-8352-afd127b2fa81",
|
||||
"serverId": "5",
|
||||
"serverName": "servhost.nsk.rt.shx.su",
|
||||
"filename": "servhost.nsk.rt.shx.su_2026-05-12_21-45-14.rsc",
|
||||
"sizeBytes": 707990,
|
||||
"createdAt": "2026-05-12T14:45:14.994Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "3eac2f70-a5e8-428c-a50d-59223061827b",
|
||||
"serverId": "4",
|
||||
"serverName": "veesp.swe.rt.shx.su",
|
||||
"filename": "veesp.swe.rt.shx.su_2026-05-12_21-45-08.rsc",
|
||||
"sizeBytes": 2195,
|
||||
"createdAt": "2026-05-12T14:45:08.312Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "2c600052-70ff-4525-910d-725d0f4d2cfb",
|
||||
"serverId": "3",
|
||||
"serverName": "vpsville.msk.rt.shx.su",
|
||||
"filename": "vpsville.msk.rt.shx.su_2026-05-12_21-45-07.rsc",
|
||||
"sizeBytes": 710694,
|
||||
"createdAt": "2026-05-12T14:45:07.786Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "b97be1bb-9c72-44a8-be27-333ddb58ca24",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-12_21-45-05.rsc",
|
||||
"sizeBytes": 1712337,
|
||||
"createdAt": "2026-05-12T14:45:05.250Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "891217c8-faa2-40d7-b093-e325f41d8a3d",
|
||||
"serverId": "6",
|
||||
"serverName": "ihor.msk.rt.shx.su",
|
||||
"filename": "ihor.msk.rt.shx.su_2026-05-12_21-44-21.rsc",
|
||||
"sizeBytes": 711251,
|
||||
"createdAt": "2026-05-12T14:44:21.828Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "f6bc0abc-c783-4d6f-92b6-d0cc489e6772",
|
||||
"serverId": "5",
|
||||
"serverName": "servhost.nsk.rt.shx.su",
|
||||
"filename": "servhost.nsk.rt.shx.su_2026-05-12_21-44-17.rsc",
|
||||
"sizeBytes": 707990,
|
||||
"createdAt": "2026-05-12T14:44:17.008Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "3f8b71df-5879-4fda-98f9-316353db3657",
|
||||
"serverId": "4",
|
||||
"serverName": "veesp.swe.rt.shx.su",
|
||||
"filename": "veesp.swe.rt.shx.su_2026-05-12_21-44-14.rsc",
|
||||
"sizeBytes": 2195,
|
||||
"createdAt": "2026-05-12T14:44:14.981Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "0431c73a-a2a2-4100-8940-a7e560649f53",
|
||||
"serverId": "3",
|
||||
"serverName": "vpsville.msk.rt.shx.su",
|
||||
"filename": "vpsville.msk.rt.shx.su_2026-05-12_21-44-14.rsc",
|
||||
"sizeBytes": 710694,
|
||||
"createdAt": "2026-05-12T14:44:14.434Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "523315c7-4db9-4e09-8bfb-3f36dd692485",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-12_21-44-11.rsc",
|
||||
"sizeBytes": 1712337,
|
||||
"createdAt": "2026-05-12T14:44:11.677Z",
|
||||
"kind": "auto"
|
||||
},
|
||||
{
|
||||
"id": "b820bdc8-d184-4615-92e1-40df3872d554",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-07_14-41-51.rsc",
|
||||
"sizeBytes": 913056,
|
||||
"createdAt": "2026-05-07T07:41:51.371Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "7d46ee5b-c829-4d42-af90-847026bafd8a",
|
||||
"serverId": "6",
|
||||
"serverName": "ihor.msk.rt.shx.su",
|
||||
"filename": "ihor.msk.rt.shx.su_2026-05-07_14-19-22.rsc",
|
||||
"sizeBytes": 676415,
|
||||
"createdAt": "2026-05-07T07:19:22.073Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "c34f71e5-6766-456b-9b8a-9b8efaa91edc",
|
||||
"serverId": "5",
|
||||
"serverName": "servhost.nsk.rt.shx.su",
|
||||
"filename": "servhost.nsk.rt.shx.su_2026-05-07_14-19-19.rsc",
|
||||
"sizeBytes": 672268,
|
||||
"createdAt": "2026-05-07T07:19:19.639Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "40e253a1-98a8-40a7-982b-7c5af213f490",
|
||||
"serverId": "4",
|
||||
"serverName": "veesp.swe.rt.shx.su",
|
||||
"filename": "veesp.swe.rt.shx.su_2026-05-07_14-19-17.rsc",
|
||||
"sizeBytes": 2131,
|
||||
"createdAt": "2026-05-07T07:19:17.801Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "9199d0a8-9bc0-4d20-8498-b37f1f15262b",
|
||||
"serverId": "3",
|
||||
"serverName": "vpsville.msk.rt.shx.su",
|
||||
"filename": "vpsville.msk.rt.shx.su_2026-05-07_14-19-17.rsc",
|
||||
"sizeBytes": 675732,
|
||||
"createdAt": "2026-05-07T07:19:17.272Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "4de5263f-edb4-4ca9-ae90-2247defdc05e",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-07_14-19-14.rsc",
|
||||
"sizeBytes": 913056,
|
||||
"createdAt": "2026-05-07T07:19:14.772Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "de49d319-a24f-475c-bb6e-8075eff86380",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-07_14-16-45.rsc",
|
||||
"sizeBytes": 911521,
|
||||
"createdAt": "2026-05-07T07:16:45.543Z",
|
||||
"kind": "manual",
|
||||
"notes": "async"
|
||||
},
|
||||
{
|
||||
"id": "ec5b9e31-42cb-40b9-aba7-3501d5145713",
|
||||
"serverId": "6",
|
||||
"serverName": "ihor.msk.rt.shx.su",
|
||||
"filename": "ihor.msk.rt.shx.su_2026-05-07_14-13-58.rsc",
|
||||
"sizeBytes": 676415,
|
||||
"createdAt": "2026-05-07T07:13:58.749Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "7909c7de-a548-44d4-bdf7-7c221bfedd36",
|
||||
"serverId": "5",
|
||||
"serverName": "servhost.nsk.rt.shx.su",
|
||||
"filename": "servhost.nsk.rt.shx.su_2026-05-07_14-13-56.rsc",
|
||||
"sizeBytes": 672268,
|
||||
"createdAt": "2026-05-07T07:13:56.245Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "63339ebb-eb94-455e-a61b-368523fed7e1",
|
||||
"serverId": "4",
|
||||
"serverName": "veesp.swe.rt.shx.su",
|
||||
"filename": "veesp.swe.rt.shx.su_2026-05-07_14-13-54.rsc",
|
||||
"sizeBytes": 2131,
|
||||
"createdAt": "2026-05-07T07:13:54.493Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "daccab1d-f60a-4570-9d11-c7b06491f6f7",
|
||||
"serverId": "3",
|
||||
"serverName": "vpsville.msk.rt.shx.su",
|
||||
"filename": "vpsville.msk.rt.shx.su_2026-05-07_14-13-53.rsc",
|
||||
"sizeBytes": 675732,
|
||||
"createdAt": "2026-05-07T07:13:53.791Z",
|
||||
"kind": "manual"
|
||||
},
|
||||
{
|
||||
"id": "d976cae6-aae8-4f55-9452-71d5480ac8e8",
|
||||
"serverId": "2",
|
||||
"serverName": "Gateway",
|
||||
"filename": "Gateway_2026-05-07_14-13-48.rsc",
|
||||
"sizeBytes": 913056,
|
||||
"createdAt": "2026-05-07T07:13:48.326Z",
|
||||
"kind": "manual"
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,44 +0,0 @@
|
||||
# synthetic export generated by MikrotikManager
|
||||
# generated-at: 2026-05-07T07:13:21.880Z
|
||||
|
||||
/system identity
|
||||
set name="veesp.swe.rt.shx.su"
|
||||
|
||||
/interface
|
||||
:put "interface name="ether1" mtu=1500 disabled=no"
|
||||
:put "interface name="MSK-DC" mtu=1350 disabled=no"
|
||||
:put "interface name="MSK-IHOR" mtu=1400 disabled=no"
|
||||
:put "interface name="MSK-VPSVILLE" mtu=1400 disabled=no"
|
||||
:put "interface name="NSK-SERVHOST" mtu=1400 disabled=no"
|
||||
:put "interface name="br1" mtu=1500 disabled=no"
|
||||
:put "interface name="gre-tunnel1" mtu=1450 disabled=no"
|
||||
:put "interface name="lo" mtu=65536 disabled=no"
|
||||
:put "interface name="wg-tunnel" mtu=1420 disabled=no"
|
||||
:put "interface name="wg1" mtu=1280 disabled=no"
|
||||
|
||||
/ip address
|
||||
add address=62.182.194.146/24 interface="ether1"
|
||||
add address=10.200.100.26/30 interface="MSK-IHOR"
|
||||
add address=10.200.200.2/30 interface="*5"
|
||||
add address=10.200.40.2/30 interface="MSK-VPSVILLE"
|
||||
add address=10.205.1.2/30 interface="wg1"
|
||||
add address=10.200.100.2/30 interface="*11" comment="Interface: MSK-SELECTEL (GRE) to selectel.msk.rt.shx.su"
|
||||
add address=10.200.100.38/30 interface="MSK-DC" comment="Interface: MSK-DC (GRE) to dc.msk.rt.shx.su"
|
||||
add address=10.200.100.14/30 interface="MSK-VPSVILLE" comment="Interface: MSK-VPSVILLE (GRE) to vpsville.msk.rt.shx.su"
|
||||
add address=10.101.1.2/30 interface="gre-tunnel1"
|
||||
add address=10.200.100.54/30 interface="NSK-SERVHOST" comment="Interface: NSK-SERVHOST (GRE) to servhost.nsk.rt.shx.su"
|
||||
|
||||
/ip route
|
||||
add dst-address=0.0.0.0/0 gateway=62.182.194.1 distance=1
|
||||
add dst-address=10.101.1.0/30 gateway=gre-tunnel1 distance=0
|
||||
add dst-address=10.200.100.12/30 gateway=MSK-VPSVILLE distance=0
|
||||
add dst-address=10.200.100.24/30 gateway=MSK-IHOR distance=0
|
||||
add dst-address=10.200.100.36/30 gateway=MSK-DC distance=0
|
||||
add dst-address=10.200.100.52/30 gateway=NSK-SERVHOST distance=0
|
||||
add dst-address=10.205.1.0/30 gateway=wg1 distance=0
|
||||
add dst-address=62.182.194.0/24 gateway=br1 distance=0
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.13%MSK-VPSVILLE distance=1
|
||||
|
||||
/ip firewall filter
|
||||
add chain=input action=drop protocol=udp dst-port=53
|
||||
add chain=input action=accept protocol=udp dst-port=13231
|
||||
@@ -1,44 +0,0 @@
|
||||
# synthetic export generated by MikrotikManager
|
||||
# generated-at: 2026-05-07T07:13:54.118Z
|
||||
|
||||
/system identity
|
||||
set name="veesp.swe.rt.shx.su"
|
||||
|
||||
/interface
|
||||
:put "interface name="ether1" mtu=1500 disabled=no"
|
||||
:put "interface name="MSK-DC" mtu=1350 disabled=no"
|
||||
:put "interface name="MSK-IHOR" mtu=1400 disabled=no"
|
||||
:put "interface name="MSK-VPSVILLE" mtu=1400 disabled=no"
|
||||
:put "interface name="NSK-SERVHOST" mtu=1400 disabled=no"
|
||||
:put "interface name="br1" mtu=1500 disabled=no"
|
||||
:put "interface name="gre-tunnel1" mtu=1450 disabled=no"
|
||||
:put "interface name="lo" mtu=65536 disabled=no"
|
||||
:put "interface name="wg-tunnel" mtu=1420 disabled=no"
|
||||
:put "interface name="wg1" mtu=1280 disabled=no"
|
||||
|
||||
/ip address
|
||||
add address=62.182.194.146/24 interface="ether1"
|
||||
add address=10.200.100.26/30 interface="MSK-IHOR"
|
||||
add address=10.200.200.2/30 interface="*5"
|
||||
add address=10.200.40.2/30 interface="MSK-VPSVILLE"
|
||||
add address=10.205.1.2/30 interface="wg1"
|
||||
add address=10.200.100.2/30 interface="*11" comment="Interface: MSK-SELECTEL (GRE) to selectel.msk.rt.shx.su"
|
||||
add address=10.200.100.38/30 interface="MSK-DC" comment="Interface: MSK-DC (GRE) to dc.msk.rt.shx.su"
|
||||
add address=10.200.100.14/30 interface="MSK-VPSVILLE" comment="Interface: MSK-VPSVILLE (GRE) to vpsville.msk.rt.shx.su"
|
||||
add address=10.101.1.2/30 interface="gre-tunnel1"
|
||||
add address=10.200.100.54/30 interface="NSK-SERVHOST" comment="Interface: NSK-SERVHOST (GRE) to servhost.nsk.rt.shx.su"
|
||||
|
||||
/ip route
|
||||
add dst-address=0.0.0.0/0 gateway=62.182.194.1 distance=1
|
||||
add dst-address=10.101.1.0/30 gateway=gre-tunnel1 distance=0
|
||||
add dst-address=10.200.100.12/30 gateway=MSK-VPSVILLE distance=0
|
||||
add dst-address=10.200.100.24/30 gateway=MSK-IHOR distance=0
|
||||
add dst-address=10.200.100.36/30 gateway=MSK-DC distance=0
|
||||
add dst-address=10.200.100.52/30 gateway=NSK-SERVHOST distance=0
|
||||
add dst-address=10.205.1.0/30 gateway=wg1 distance=0
|
||||
add dst-address=62.182.194.0/24 gateway=br1 distance=0
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.13%MSK-VPSVILLE distance=1
|
||||
|
||||
/ip firewall filter
|
||||
add chain=input action=drop protocol=udp dst-port=53
|
||||
add chain=input action=accept protocol=udp dst-port=13231
|
||||
@@ -1,44 +0,0 @@
|
||||
# synthetic export generated by MikrotikManager
|
||||
# generated-at: 2026-05-07T07:19:17.424Z
|
||||
|
||||
/system identity
|
||||
set name="veesp.swe.rt.shx.su"
|
||||
|
||||
/interface
|
||||
:put "interface name="ether1" mtu=1500 disabled=no"
|
||||
:put "interface name="MSK-DC" mtu=1350 disabled=no"
|
||||
:put "interface name="MSK-IHOR" mtu=1400 disabled=no"
|
||||
:put "interface name="MSK-VPSVILLE" mtu=1400 disabled=no"
|
||||
:put "interface name="NSK-SERVHOST" mtu=1400 disabled=no"
|
||||
:put "interface name="br1" mtu=1500 disabled=no"
|
||||
:put "interface name="gre-tunnel1" mtu=1450 disabled=no"
|
||||
:put "interface name="lo" mtu=65536 disabled=no"
|
||||
:put "interface name="wg-tunnel" mtu=1420 disabled=no"
|
||||
:put "interface name="wg1" mtu=1280 disabled=no"
|
||||
|
||||
/ip address
|
||||
add address=62.182.194.146/24 interface="ether1"
|
||||
add address=10.200.100.26/30 interface="MSK-IHOR"
|
||||
add address=10.200.200.2/30 interface="*5"
|
||||
add address=10.200.40.2/30 interface="MSK-VPSVILLE"
|
||||
add address=10.205.1.2/30 interface="wg1"
|
||||
add address=10.200.100.2/30 interface="*11" comment="Interface: MSK-SELECTEL (GRE) to selectel.msk.rt.shx.su"
|
||||
add address=10.200.100.38/30 interface="MSK-DC" comment="Interface: MSK-DC (GRE) to dc.msk.rt.shx.su"
|
||||
add address=10.200.100.14/30 interface="MSK-VPSVILLE" comment="Interface: MSK-VPSVILLE (GRE) to vpsville.msk.rt.shx.su"
|
||||
add address=10.101.1.2/30 interface="gre-tunnel1"
|
||||
add address=10.200.100.54/30 interface="NSK-SERVHOST" comment="Interface: NSK-SERVHOST (GRE) to servhost.nsk.rt.shx.su"
|
||||
|
||||
/ip route
|
||||
add dst-address=0.0.0.0/0 gateway=62.182.194.1 distance=1
|
||||
add dst-address=10.101.1.0/30 gateway=gre-tunnel1 distance=0
|
||||
add dst-address=10.200.100.12/30 gateway=MSK-VPSVILLE distance=0
|
||||
add dst-address=10.200.100.24/30 gateway=MSK-IHOR distance=0
|
||||
add dst-address=10.200.100.36/30 gateway=MSK-DC distance=0
|
||||
add dst-address=10.200.100.52/30 gateway=NSK-SERVHOST distance=0
|
||||
add dst-address=10.205.1.0/30 gateway=wg1 distance=0
|
||||
add dst-address=62.182.194.0/24 gateway=br1 distance=0
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.13%MSK-VPSVILLE distance=1
|
||||
|
||||
/ip firewall filter
|
||||
add chain=input action=drop protocol=udp dst-port=53
|
||||
add chain=input action=accept protocol=udp dst-port=13231
|
||||
@@ -1,45 +0,0 @@
|
||||
# synthetic export generated by MikrotikManager
|
||||
# generated-at: 2026-05-12T14:44:14.588Z
|
||||
|
||||
/system identity
|
||||
set name="veesp.swe.rt.shx.su"
|
||||
|
||||
/interface
|
||||
:put "interface name="ether1" mtu=1500 disabled=no"
|
||||
:put "interface name="MSK-DC" mtu=1350 disabled=no"
|
||||
:put "interface name="MSK-IHOR" mtu=1400 disabled=no"
|
||||
:put "interface name="MSK-VPSVILLE" mtu=1400 disabled=no"
|
||||
:put "interface name="NSK-SERVHOST" mtu=1400 disabled=no"
|
||||
:put "interface name="br1" mtu=1500 disabled=no"
|
||||
:put "interface name="gre-tunnel1" mtu=1450 disabled=no"
|
||||
:put "interface name="lo" mtu=65536 disabled=no"
|
||||
:put "interface name="wg-tunnel" mtu=1420 disabled=no"
|
||||
:put "interface name="wg1" mtu=1280 disabled=no"
|
||||
|
||||
/ip address
|
||||
add address=62.182.194.146/24 interface="ether1"
|
||||
add address=10.200.100.26/30 interface="MSK-IHOR"
|
||||
add address=10.200.200.2/30 interface="*5"
|
||||
add address=10.200.40.2/30 interface="MSK-VPSVILLE"
|
||||
add address=10.205.1.2/30 interface="wg1"
|
||||
add address=10.200.100.2/30 interface="*11" comment="Interface: MSK-SELECTEL (GRE) to selectel.msk.rt.shx.su"
|
||||
add address=10.200.100.38/30 interface="MSK-DC" comment="Interface: MSK-DC (GRE) to dc.msk.rt.shx.su"
|
||||
add address=10.200.100.14/30 interface="MSK-VPSVILLE" comment="Interface: MSK-VPSVILLE (GRE) to vpsville.msk.rt.shx.su"
|
||||
add address=10.101.1.2/30 interface="gre-tunnel1"
|
||||
add address=10.200.100.54/30 interface="NSK-SERVHOST" comment="Interface: NSK-SERVHOST (GRE) to servhost.nsk.rt.shx.su"
|
||||
|
||||
/ip route
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.13%MSK-VPSVILLE distance=1
|
||||
add dst-address=0.0.0.0/0 gateway=62.182.194.1 distance=1
|
||||
add dst-address=10.101.1.0/30 gateway=gre-tunnel1 distance=0
|
||||
add dst-address=10.200.100.12/30 gateway=MSK-VPSVILLE distance=0
|
||||
add dst-address=10.200.100.24/30 gateway=MSK-IHOR distance=0
|
||||
add dst-address=10.200.100.36/30 gateway=MSK-DC distance=0
|
||||
add dst-address=10.200.100.52/30 gateway=NSK-SERVHOST distance=0
|
||||
add dst-address=10.205.1.0/30 gateway=wg1 distance=0
|
||||
add dst-address=62.182.194.0/24 gateway=br1 distance=0
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.53 distance=1
|
||||
|
||||
/ip firewall filter
|
||||
add chain=input action=drop protocol=udp dst-port=53
|
||||
add chain=input action=accept protocol=udp dst-port=13231
|
||||
@@ -1,45 +0,0 @@
|
||||
# synthetic export generated by MikrotikManager
|
||||
# generated-at: 2026-05-12T14:45:07.934Z
|
||||
|
||||
/system identity
|
||||
set name="veesp.swe.rt.shx.su"
|
||||
|
||||
/interface
|
||||
:put "interface name="ether1" mtu=1500 disabled=no"
|
||||
:put "interface name="MSK-DC" mtu=1350 disabled=no"
|
||||
:put "interface name="MSK-IHOR" mtu=1400 disabled=no"
|
||||
:put "interface name="MSK-VPSVILLE" mtu=1400 disabled=no"
|
||||
:put "interface name="NSK-SERVHOST" mtu=1400 disabled=no"
|
||||
:put "interface name="br1" mtu=1500 disabled=no"
|
||||
:put "interface name="gre-tunnel1" mtu=1450 disabled=no"
|
||||
:put "interface name="lo" mtu=65536 disabled=no"
|
||||
:put "interface name="wg-tunnel" mtu=1420 disabled=no"
|
||||
:put "interface name="wg1" mtu=1280 disabled=no"
|
||||
|
||||
/ip address
|
||||
add address=62.182.194.146/24 interface="ether1"
|
||||
add address=10.200.100.26/30 interface="MSK-IHOR"
|
||||
add address=10.200.200.2/30 interface="*5"
|
||||
add address=10.200.40.2/30 interface="MSK-VPSVILLE"
|
||||
add address=10.205.1.2/30 interface="wg1"
|
||||
add address=10.200.100.2/30 interface="*11" comment="Interface: MSK-SELECTEL (GRE) to selectel.msk.rt.shx.su"
|
||||
add address=10.200.100.38/30 interface="MSK-DC" comment="Interface: MSK-DC (GRE) to dc.msk.rt.shx.su"
|
||||
add address=10.200.100.14/30 interface="MSK-VPSVILLE" comment="Interface: MSK-VPSVILLE (GRE) to vpsville.msk.rt.shx.su"
|
||||
add address=10.101.1.2/30 interface="gre-tunnel1"
|
||||
add address=10.200.100.54/30 interface="NSK-SERVHOST" comment="Interface: NSK-SERVHOST (GRE) to servhost.nsk.rt.shx.su"
|
||||
|
||||
/ip route
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.13%MSK-VPSVILLE distance=1
|
||||
add dst-address=0.0.0.0/0 gateway=62.182.194.1 distance=1
|
||||
add dst-address=10.101.1.0/30 gateway=gre-tunnel1 distance=0
|
||||
add dst-address=10.200.100.12/30 gateway=MSK-VPSVILLE distance=0
|
||||
add dst-address=10.200.100.24/30 gateway=MSK-IHOR distance=0
|
||||
add dst-address=10.200.100.36/30 gateway=MSK-DC distance=0
|
||||
add dst-address=10.200.100.52/30 gateway=NSK-SERVHOST distance=0
|
||||
add dst-address=10.205.1.0/30 gateway=wg1 distance=0
|
||||
add dst-address=62.182.194.0/24 gateway=br1 distance=0
|
||||
add dst-address=192.168.0.0/16 gateway=10.200.100.53 distance=1
|
||||
|
||||
/ip firewall filter
|
||||
add chain=input action=drop protocol=udp dst-port=53
|
||||
add chain=input action=accept protocol=udp dst-port=13231
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user