mirror of
https://github.com/fosrl/pangolin.git
synced 2025-07-23 04:04:35 +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({}),
|
||||
gerbil: z
|
||||
.object({
|
||||
exit_node_name: z.string().optional().default("default"),
|
||||
exit_node_name: z.string().optional(),
|
||||
start_port: portSchema
|
||||
.optional()
|
||||
.default(51820)
|
||||
|
|
|
@ -68,6 +68,10 @@ export async function getConfig(
|
|||
subEndpoint = await getUniqueExitNodeEndpointName();
|
||||
}
|
||||
|
||||
const exitNodeName =
|
||||
config.getRawConfig().gerbil.exit_node_name ||
|
||||
`Exit Node ${publicKey.slice(0, 8)}`;
|
||||
|
||||
// create a new exit node
|
||||
exitNode = await db
|
||||
.insert(exitNodes)
|
||||
|
@ -77,7 +81,7 @@ export async function getConfig(
|
|||
address,
|
||||
listenPort,
|
||||
reachableAt,
|
||||
name: config.getRawConfig().gerbil.exit_node_name // defaults to "default"
|
||||
name: exitNodeName
|
||||
})
|
||||
.returning()
|
||||
.execute();
|
||||
|
|
|
@ -106,13 +106,19 @@ export async function copyInConfig() {
|
|||
});
|
||||
|
||||
const exitNodeName = config.getRawConfig().gerbil.exit_node_name;
|
||||
|
||||
if (exitNodeName) {
|
||||
await db
|
||||
.update(exitNodes)
|
||||
.set({ endpoint, listenPort })
|
||||
.where(eq(exitNodes.name, exitNodeName));
|
||||
} else {
|
||||
await db
|
||||
.update(exitNodes)
|
||||
.set({ endpoint })
|
||||
.where(eq(exitNodes.name, exitNodeName));
|
||||
.where(ne(exitNodes.endpoint, endpoint));
|
||||
await db
|
||||
.update(exitNodes)
|
||||
.set({ listenPort })
|
||||
.where(eq(exitNodes.name, exitNodeName));
|
||||
.where(ne(exitNodes.listenPort, listenPort));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue