mirror of
https://github.com/fosrl/pangolin.git
synced 2026-02-24 02:03:41 +00:00
Merge branch 'main' into dev
This commit is contained in:
@@ -2,9 +2,13 @@ import { db, dnsRecords } from "@server/db";
|
||||
import { domains, exitNodes, orgDomains, orgs, resources } from "@server/db";
|
||||
import config from "@server/lib/config";
|
||||
import { eq, ne } from "drizzle-orm";
|
||||
import logger from "@server/logger";
|
||||
import { build } from "@server/build";
|
||||
|
||||
export async function copyInConfig() {
|
||||
if (build == "saas") {
|
||||
return;
|
||||
}
|
||||
|
||||
const endpoint = config.getRawConfig().gerbil.base_endpoint;
|
||||
const listenPort = config.getRawConfig().gerbil.start_port;
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import m11 from "./scriptsPg/1.14.0";
|
||||
import m12 from "./scriptsPg/1.15.0";
|
||||
import m13 from "./scriptsPg/1.15.3";
|
||||
import m14 from "./scriptsPg/1.15.4";
|
||||
import { build } from "@server/build";
|
||||
|
||||
// THIS CANNOT IMPORT ANYTHING FROM THE SERVER
|
||||
// EXCEPT FOR THE DATABASE AND THE SCHEMA
|
||||
@@ -53,6 +54,10 @@ async function run() {
|
||||
}
|
||||
|
||||
export async function runMigrations() {
|
||||
if (build == "saas") {
|
||||
console.log("Running in SaaS mode, skipping migrations...");
|
||||
return;
|
||||
}
|
||||
if (process.env.DISABLE_MIGRATIONS) {
|
||||
console.log("Migrations are disabled. Skipping...");
|
||||
return;
|
||||
|
||||
@@ -37,6 +37,7 @@ import m32 from "./scriptsSqlite/1.14.0";
|
||||
import m33 from "./scriptsSqlite/1.15.0";
|
||||
import m34 from "./scriptsSqlite/1.15.3";
|
||||
import m35 from "./scriptsSqlite/1.15.4";
|
||||
import { build } from "@server/build";
|
||||
|
||||
// THIS CANNOT IMPORT ANYTHING FROM THE SERVER
|
||||
// EXCEPT FOR THE DATABASE AND THE SCHEMA
|
||||
@@ -105,6 +106,10 @@ function backupDb() {
|
||||
}
|
||||
|
||||
export async function runMigrations() {
|
||||
if (build == "saas") {
|
||||
console.log("Running in SaaS mode, skipping migrations...");
|
||||
return;
|
||||
}
|
||||
if (process.env.DISABLE_MIGRATIONS) {
|
||||
console.log("Migrations are disabled. Skipping...");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user