calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-08-19 18:52:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with subnets in migrations

Browse Source
This commit is contained in:
Owen
2026-08-18 17:50:32 -04:00
parent fb5b564c00
commit dc8e724482
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/db/pg/schema/schema.ts
+2 -2
View File
@@ -105,7 +105,6 @@ export const sites = pgTable(
}), }),
name: varchar("name").notNull(), name: varchar("name").notNull(),
pubKey: varchar("pubKey"), pubKey: varchar("pubKey"),
subnet: varchar("subnet"),
exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node and INCLUDES THE CIDR exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node and INCLUDES THE CIDR
megabytesIn: real("bytesIn").default(0), megabytesIn: real("bytesIn").default(0),
megabytesOut: real("bytesOut").default(0), megabytesOut: real("bytesOut").default(0),
@@ -1325,7 +1324,8 @@ export const clients = pgTable(
olmId: text("olmId"), // to lock it to a specific olm optionally olmId: text("olmId"), // to lock it to a specific olm optionally
name: varchar("name").notNull(), name: varchar("name").notNull(),
pubKey: varchar("pubKey"), pubKey: varchar("pubKey"),
exitNodeSubnet: varchar("exitNodeSubnet").notNull(), // INCLUDES THE CIDR subnet: varchar("subnet").notNull(),
exitNodeSubnet: varchar("exitNodeSubnet"), // INCLUDES THE CIDR
megabytesIn: real("bytesIn"), megabytesIn: real("bytesIn"),
megabytesOut: real("bytesOut"), megabytesOut: real("bytesOut"),
lastBandwidthUpdate: varchar("lastBandwidthUpdate"), lastBandwidthUpdate: varchar("lastBandwidthUpdate"),
server/setup/scriptsPg/1.22.0.ts
+2 -2
View File
@@ -197,7 +197,7 @@ export default async function migration() {
); );
`); `);
await db.execute( await db.execute(
sql`ALTER TABLE "clients" RENAME COLUMN "subnet" TO "exitNodeSubnet";` sql`ALTER TABLE "clients" ADD COLUMN "exitNodeSubnet" text;`
); );
await db.execute( await db.execute(
sql`ALTER TABLE "roles" ALTER COLUMN "sshSudoMode" SET DEFAULT 'full';` sql`ALTER TABLE "roles" ALTER COLUMN "sshSudoMode" SET DEFAULT 'full';`
@@ -232,7 +232,7 @@ export default async function migration() {
sql`ALTER TABLE "siteResources" ADD COLUMN "requiresExitNodeConnection" boolean DEFAULT false NOT NULL;` sql`ALTER TABLE "siteResources" ADD COLUMN "requiresExitNodeConnection" boolean DEFAULT false NOT NULL;`
); );
await db.execute( await db.execute(
sql`ALTER TABLE "sites" ADD COLUMN "exitNodeSubnet" text;` sql`ALTER TABLE "sites" RENAME COLUMN "subnet" TO "exitNodeSubnet";`
); );
await db.execute( await db.execute(
sql`ALTER TABLE "targets" ADD COLUMN "providerId" integer;` sql`ALTER TABLE "targets" ADD COLUMN "providerId" integer;`