pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-19 11:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:fosrl/pangolin into dev

Browse Source
This commit is contained in:
Owen
2025-12-06 17:24:16 -05:00
parent 58177f4a02 28725dd164
commit 0beaadf512
11 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/private/lib/config.ts
View File

@@ -83,9 +83,6 @@ export class PrivateConfig {
? this.rawPrivateConfig.branding?.logo?.navbar?.height.toString()
: undefined;
process.env.BRANDING_FAVICON_PATH =
this.rawPrivateConfig.branding?.favicon_path;
process.env.BRANDING_APP_NAME =
this.rawPrivateConfig.branding?.app_name || "Pangolin";
@@ -95,13 +92,9 @@ export class PrivateConfig {
);
}
process.env.LOGIN_PAGE_TITLE_TEXT =
this.rawPrivateConfig.branding?.login_page?.title_text || "";
process.env.LOGIN_PAGE_SUBTITLE_TEXT =
this.rawPrivateConfig.branding?.login_page?.subtitle_text || "";
process.env.SIGNUP_PAGE_TITLE_TEXT =
this.rawPrivateConfig.branding?.signup_page?.title_text || "";
process.env.SIGNUP_PAGE_SUBTITLE_TEXT =
this.rawPrivateConfig.branding?.signup_page?.subtitle_text || "";

7
server/private/lib/readConfigFile.ts
View File

@@ -115,7 +115,6 @@ export const privateConfigSchema = z.object({
.optional()
})
.optional(),
favicon_path: z.string().optional(),
footer: z
.array(
z.object({
@@ -127,14 +126,12 @@ export const privateConfigSchema = z.object({
hide_auth_layout_footer: z.boolean().optional().default(false),
login_page: z
.object({
subtitle_text: z.string().optional(),
title_text: z.string().optional()
subtitle_text: z.string().optional()
})
.optional(),
signup_page: z
.object({
subtitle_text: z.string().optional(),
title_text: z.string().optional()
subtitle_text: z.string().optional()
})
.optional(),
resource_auth_page: z

8
server/private/routers/remoteExitNode/handleRemoteExitNodePingMessage.ts
View File

@@ -63,10 +63,10 @@ export const startRemoteExitNodeOfflineChecker = (): void => {
inArray(sites.exitNodeId, exitNodeIds)
)
);
// loop through the sites and process their lastBandwidthUpdate as an iso string and if its more than 1 minute old then mark the site offline
for (const site of sitesOnNode) {
if (!site.lastBandwidthUpdate) {
if (!site.lastBandwidthUpdate) {
continue;
}
const lastBandwidthUpdate = new Date(site.lastBandwidthUpdate);
@@ -83,7 +83,7 @@ export const startRemoteExitNodeOfflineChecker = (): void => {
}
}, OFFLINE_CHECK_INTERVAL);
logger.info("Started offline checker interval");
logger.debug("Started offline checker interval");
};
/**
@@ -137,4 +137,4 @@ export const handleRemoteExitNodePingMessage: MessageHandler = async (context) =
broadcast: false,
excludeSender: false
};
};
};

2
server/routers/olm/handleOlmPingMessage.ts
View File

@@ -75,7 +75,7 @@ export const startOlmOfflineChecker = (): void => {
}
}, OFFLINE_CHECK_INTERVAL);
logger.info("Started offline checker interval");
logger.debug("Started offline checker interval");
};
/**

4
server/setup/ensureSetupToken.ts
View File

@@ -31,7 +31,7 @@ export async function ensureSetupToken() {
// If admin exists, no need for setup token
if (existingAdmin) {
logger.warn("Server admin exists. Setup token generation skipped.");
logger.debug("Server admin exists. Setup token generation skipped.");
return;
}
@@ -70,4 +70,4 @@ export async function ensureSetupToken() {
console.error("Failed to ensure setup token:", error);
throw error;
}
}
}