mirror of
https://github.com/fosrl/pangolin.git
synced 2025-07-23 12:15:36 +02:00
make exit node name backwards compatible
This commit is contained in:
parent
b39708700d
commit
7bbb687047
3 changed files with 21 additions and 11 deletions
|
@ -161,7 +161,7 @@ export const configSchema = z
|
||||||
.default({}),
|
.default({}),
|
||||||
gerbil: z
|
gerbil: z
|
||||||
.object({
|
.object({
|
||||||
exit_node_name: z.string().optional().default("default"),
|
exit_node_name: z.string().optional(),
|
||||||
start_port: portSchema
|
start_port: portSchema
|
||||||
.optional()
|
.optional()
|
||||||
.default(51820)
|
.default(51820)
|
||||||
|
|
|
@ -68,6 +68,10 @@ export async function getConfig(
|
||||||
subEndpoint = await getUniqueExitNodeEndpointName();
|
subEndpoint = await getUniqueExitNodeEndpointName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const exitNodeName =
|
||||||
|
config.getRawConfig().gerbil.exit_node_name ||
|
||||||
|
`Exit Node ${publicKey.slice(0, 8)}`;
|
||||||
|
|
||||||
// create a new exit node
|
// create a new exit node
|
||||||
exitNode = await db
|
exitNode = await db
|
||||||
.insert(exitNodes)
|
.insert(exitNodes)
|
||||||
|
@ -77,7 +81,7 @@ export async function getConfig(
|
||||||
address,
|
address,
|
||||||
listenPort,
|
listenPort,
|
||||||
reachableAt,
|
reachableAt,
|
||||||
name: config.getRawConfig().gerbil.exit_node_name // defaults to "default"
|
name: exitNodeName
|
||||||
})
|
})
|
||||||
.returning()
|
.returning()
|
||||||
.execute();
|
.execute();
|
||||||
|
|
|
@ -106,13 +106,19 @@ export async function copyInConfig() {
|
||||||
});
|
});
|
||||||
|
|
||||||
const exitNodeName = config.getRawConfig().gerbil.exit_node_name;
|
const exitNodeName = config.getRawConfig().gerbil.exit_node_name;
|
||||||
|
if (exitNodeName) {
|
||||||
await db
|
await db
|
||||||
.update(exitNodes)
|
.update(exitNodes)
|
||||||
.set({ endpoint })
|
.set({ endpoint, listenPort })
|
||||||
.where(eq(exitNodes.name, exitNodeName));
|
.where(eq(exitNodes.name, exitNodeName));
|
||||||
await db
|
} else {
|
||||||
.update(exitNodes)
|
await db
|
||||||
.set({ listenPort })
|
.update(exitNodes)
|
||||||
.where(eq(exitNodes.name, exitNodeName));
|
.set({ endpoint })
|
||||||
|
.where(ne(exitNodes.endpoint, endpoint));
|
||||||
|
await db
|
||||||
|
.update(exitNodes)
|
||||||
|
.set({ listenPort })
|
||||||
|
.where(ne(exitNodes.listenPort, listenPort));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue