Mirroristas/pockethost
2
0
Fork 0
mirror of https://github.com/pockethost/pockethost.git synced 2025-03-30 15:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up APP_URL logic

Browse Source
This commit is contained in:
Ben Allfree 2024-11-18 06:17:49 -08:00
parent 99627e12f2
commit a9ef782666
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/dashboard/vite.config.ts
View File

@ -13,7 +13,7 @@ const config: UserConfig = {
server: {
port: 5174,
strictPort: true,
host: 'app.pockethost.lvh.me',
host: 'pockethost.lvh.me',
hmr: {
clientPort: 5174,
},

2
packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
View File

@ -31,7 +31,7 @@ export const firewall = async () => {
const DEV_ROUTES = {
[`mail.${APEX_DOMAIN()}`]: `http://localhost:${1080}`,
[`${MOTHERSHIP_NAME()}.${APEX_DOMAIN()}`]: `http://localhost:${MOTHERSHIP_PORT()}`,
[`${APEX_DOMAIN()}`]: `http://localhost:${8080}`,
[`${APEX_DOMAIN()}`]: `http://localhost:${5174}`,
}
const hostnameRoutes = IS_DEV() ? DEV_ROUTES : PROD_ROUTES

2
packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
View File

@ -1,5 +1,6 @@
import { GobotOptions } from 'gobot'
import {
APP_URL,
DISCORD_ALERT_CHANNEL_URL,
DISCORD_HEALTH_CHANNEL_URL,
DISCORD_STREAM_CHANNEL_URL,
@ -35,6 +36,7 @@ export async function mothership(cfg: MothershipConfig) {
DISCORD_HEALTH_CHANNEL_URL: DISCORD_HEALTH_CHANNEL_URL(),
DISCORD_ALERT_CHANNEL_URL: DISCORD_ALERT_CHANNEL_URL(),
TEST_EMAIL: TEST_EMAIL(),
APP_URL: APP_URL(),
}
dbg(env)

17
packages/pockethost/src/constants.ts
View File

@ -43,7 +43,6 @@ export const _HTTP_PROTOCOL = env
.get('HTTP_PROTOCOL')
.default('https:')
.asString()
export const _APP_NAME = env.get('APP_NAME').default('app').asString()
export const _MOTHERSHIP_NAME = env
.get('MOTHERSHIP_NAME')
.default('pockethost-central')
@ -83,9 +82,7 @@ export const createSettings = () => ({
PH_PROJECT_ROOT: mkPath(PH_PROJECT_ROOT()),
HTTP_PROTOCOL: mkString(_HTTP_PROTOCOL),
APP_NAME: mkString(_APP_NAME),
APP_URL: mkString(`${_HTTP_PROTOCOL}//${_APP_NAME}.${_APEX_DOMAIN}`),
BLOG_URL: mkString(`${_HTTP_PROTOCOL}//${_APEX_DOMAIN}`),
APP_URL: mkString(`${_HTTP_PROTOCOL}//${_APEX_DOMAIN}`),
APEX_DOMAIN: mkString(_APEX_DOMAIN),
IPCIDR_LIST: mkCsvString([]),
@ -171,11 +168,7 @@ export const DEBUG = () =>
env.get(`PH_DEBUG`).default(_IS_DEV.toString()).asBool()
export const HTTP_PROTOCOL = () => settings().HTTP_PROTOCOL
export const APP_URL = () => settings().APP_URL
export const APP_NAME = () => settings().APP_NAME
export const BLOG_URL = (...path: string[]) =>
join(settings().BLOG_URL, ...path)
export const DOCS_URL = (...path: string[]) => BLOG_URL(`docs`, ...path)
export const APP_URL = (...path: string[]) => join(settings().APP_URL, ...path)
export const APEX_DOMAIN = () => settings().APEX_DOMAIN
@ -263,8 +256,7 @@ export const INSTANCE_DATA_DB = (id: InstanceId) =>
export const mkContainerHomePath = (...path: string[]) =>
join(`/home/pockethost`, ...path.filter((v) => !!v))
export const mkAppUrl = (path = '') => `${APP_URL()}${path}`
export const mkBlogUrl = (path = '') => `${BLOG_URL()}${path}`
export const mkDocUrl = (path = '') => mkBlogUrl(join('/docs', path))
export const mkDocUrl = (path = '') => mkAppUrl(join('/docs', path))
export const mkInstanceCanonicalHostname = (instance: InstanceFields) =>
(instance.cname_active && instance.cname) || `${instance.id}.${APEX_DOMAIN()}`
export const mkInstanceHostname = (instance: InstanceFields) =>
@ -285,9 +277,6 @@ export const logConstants = () => {
PH_PROJECT_ROOT,
HTTP_PROTOCOL,
APP_URL,
APP_NAME,
BLOG_URL,
DOCS_URL,
APEX_DOMAIN,
IPCIDR_LIST,
DAEMON_PORT,