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

fix base domain overwritten on update closes #282

Browse source
This commit is contained in:
miloschwartz 2025-03-09 21:09:56 -04:00
parent 8ec55eb70d
commit ad32e5e651
No known key found for this signature in database
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/lib/config.ts
View file

@ -181,6 +181,11 @@ export class Config {
} else if (fs.existsSync(configFilePath2)) { } else if (fs.existsSync(configFilePath2)) {
environment = loadConfig(configFilePath2); environment = loadConfig(configFilePath2);
} }
if (process.env.APP_BASE_DOMAIN) {
console.log("You're using deprecated environment variables. Transition to the configuration file. https://docs.fossorial.io/");
}
if (!environment) { if (!environment) {
throw new Error( throw new Error(
"No configuration file found. Please create one. https://docs.fossorial.io/" "No configuration file found. Please create one. https://docs.fossorial.io/"

7
server/routers/resource/updateResource.ts
View file

@ -215,8 +215,13 @@ async function updateHttpResource(
.from(domains) .from(domains)
.where(eq(domains.domainId, domainId)); .where(eq(domains.domainId, domainId));
const isBaseDomain =
updateData.isBaseDomain !== undefined
? updateData.isBaseDomain
: resource.isBaseDomain;
let fullDomain: string | null = null; let fullDomain: string | null = null;
if (updateData.isBaseDomain) { if (isBaseDomain) {
fullDomain = domain.baseDomain; fullDomain = domain.baseDomain;
} else if (subdomain && domain) { } else if (subdomain && domain) {
fullDomain = `${subdomain}.${domain.baseDomain}`; fullDomain = `${subdomain}.${domain.baseDomain}`;