mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-14 14:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into dev

Browse source
This commit is contained in:
Owen Schwartz 2025-01-15 21:38:15 -05:00
commit cb87463a69
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install/main.go
View file

@ -18,8 +18,8 @@ import (
) )
func loadVersions(config *Config) { func loadVersions(config *Config) {
config.PangolinVersion = "1.0.0-beta.5" config.PangolinVersion = "1.0.0-beta.6"
config.GerbilVersion = "1.0.0-beta.1" config.GerbilVersion = "1.0.0-beta.2"
} }
//go:embed fs/* //go:embed fs/*

4
server/routers/gerbil/getConfig.ts
View file

@ -50,7 +50,9 @@ export async function getConfig(req: Request, res: Response, next: NextFunction)
let exitNode; let exitNode;
if (exitNodeQuery.length === 0) { if (exitNodeQuery.length === 0) {
const address = await getNextAvailableSubnet(); const address = await getNextAvailableSubnet();
const listenPort = await getNextAvailablePort(); // TODO: eventually we will want to get the next available port so that we can multiple exit nodes
// const listenPort = await getNextAvailablePort();
const listenPort = config.getRawConfig().gerbil.start_port;
let subEndpoint = ""; let subEndpoint = "";
if (config.getRawConfig().gerbil.use_subdomain) { if (config.getRawConfig().gerbil.use_subdomain) {
subEndpoint = await getUniqueExitNodeEndpointName(); subEndpoint = await getUniqueExitNodeEndpointName();

3
server/setup/copyInConfig.ts
View file

@ -7,6 +7,7 @@ import logger from "@server/logger";
export async function copyInConfig() { export async function copyInConfig() {
const domain = config.getBaseDomain(); const domain = config.getBaseDomain();
const endpoint = config.getRawConfig().gerbil.base_endpoint; const endpoint = config.getRawConfig().gerbil.base_endpoint;
const listenPort = config.getRawConfig().gerbil.start_port;
// update the domain on all of the orgs where the domain is not equal to the new domain // update the domain on all of the orgs where the domain is not equal to the new domain
// TODO: eventually each org could have a unique domain that we do not want to overwrite, so this will be unnecessary // TODO: eventually each org could have a unique domain that we do not want to overwrite, so this will be unnecessary
@ -14,6 +15,8 @@ export async function copyInConfig() {
// TODO: eventually each exit node could have a different endpoint // TODO: eventually each exit node could have a different endpoint
await db.update(exitNodes).set({ endpoint }).where(ne(exitNodes.endpoint, endpoint)); await db.update(exitNodes).set({ endpoint }).where(ne(exitNodes.endpoint, endpoint));
// TODO: eventually each exit node could have a different port
await db.update(exitNodes).set({ listenPort }).where(ne(exitNodes.listenPort, listenPort));
// update all resources fullDomain to use the new domain // update all resources fullDomain to use the new domain
await db.transaction(async (trx) => { await db.transaction(async (trx) => {