diff --git a/.env-template b/.env-template
index f2927586..e1162f08 100644
--- a/.env-template
+++ b/.env-template
@@ -2,7 +2,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# https or http, as you wish
-PUBLIC_APP_PROTOCOL=https
+PUBLIC_HTTP_PROTOCOL=https
# The domain name the service lives on
PUBLIC_APP_DOMAIN=pockethost.test
diff --git a/packages/daemon/src/constants.ts b/packages/daemon/src/constants.ts
index cbddcd20..c09074e6 100644
--- a/packages/daemon/src/constants.ts
+++ b/packages/daemon/src/constants.ts
@@ -1,7 +1,7 @@
import { existsSync } from 'fs'
import { join } from 'path'
import { env, envb, envi } from './util/env'
-export const PUBLIC_APP_PROTOCOL = env('PUBLIC_APP_PROTOCOL', 'https')
+export const PUBLIC_HTTP_PROTOCOL = env('PUBLIC_HTTP_PROTOCOL', 'https')
export const PUBLIC_APP_DOMAIN = env('PUBLIC_APP_DOMAIN', `pockethost.test`)
export const PUBLIC_APP_DB = env('PUBLIC_APP_DB', `pockethost-central`)
@@ -95,7 +95,7 @@ export const HOST_OS = env('HOST_OS', 'darwin')
export const DOCKER_ARCH = env('DOCKER_ARCH', 'arm64')
console.log({
- PUBLIC_APP_PROTOCOL,
+ PUBLIC_HTTP_PROTOCOL,
PUBLIC_APP_DOMAIN,
PUBLIC_APP_DB,
DAEMON_PB_USERNAME,
diff --git a/packages/daemon/src/services/InstanceService/InstanceService.ts b/packages/daemon/src/services/InstanceService/InstanceService.ts
index 7da66d14..151609c4 100644
--- a/packages/daemon/src/services/InstanceService/InstanceService.ts
+++ b/packages/daemon/src/services/InstanceService/InstanceService.ts
@@ -2,7 +2,7 @@ import {
DAEMON_PB_IDLE_TTL,
PUBLIC_APP_DB,
PUBLIC_APP_DOMAIN,
- PUBLIC_APP_PROTOCOL,
+ PUBLIC_HTTP_PROTOCOL,
} from '$constants'
import { clientService, proxyService } from '$services'
import { mkInternalUrl, now } from '$util'
@@ -481,7 +481,7 @@ export const instanceService = mkSingleton(
dbg(`Checking for verified account`)
if (!owner?.verified) {
throw new Error(
- `Log in at ${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DOMAIN} to verify your account.`,
+ `Log in at ${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DOMAIN} to verify your account.`,
)
}
diff --git a/packages/daemon/src/services/clientService/clientService.ts b/packages/daemon/src/services/clientService/clientService.ts
index c720e0ec..2014fbbd 100644
--- a/packages/daemon/src/services/clientService/clientService.ts
+++ b/packages/daemon/src/services/clientService/clientService.ts
@@ -3,7 +3,7 @@ import {
DAEMON_PB_USERNAME,
PUBLIC_APP_DB,
PUBLIC_APP_DOMAIN,
- PUBLIC_APP_PROTOCOL,
+ PUBLIC_HTTP_PROTOCOL,
} from '$constants'
import { Logger, mkSingleton } from '@pockethost/common'
import { createPbClient } from './PbClient'
@@ -31,7 +31,7 @@ export const clientService = mkSingleton(async (cfg: ClientServiceConfig) => {
dbg(`Logged in`)
} catch (e) {
error(
- `CANNOT AUTHENTICATE TO ${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}/_/`,
+ `CANNOT AUTHENTICATE TO ${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}/_/`,
)
process.exit(-1)
}
diff --git a/packages/dashboard/src/components/helpers/Meta.svelte b/packages/dashboard/src/components/helpers/Meta.svelte
index e4c7c0c8..d9ebf101 100644
--- a/packages/dashboard/src/components/helpers/Meta.svelte
+++ b/packages/dashboard/src/components/helpers/Meta.svelte
@@ -1,7 +1,7 @@
diff --git a/packages/dashboard/src/env.ts b/packages/dashboard/src/env.ts
index 533d1a7d..e479d05d 100644
--- a/packages/dashboard/src/env.ts
+++ b/packages/dashboard/src/env.ts
@@ -22,7 +22,7 @@ export const envb = (name: PublicEnvName, _default: boolean) =>
export const PUBLIC_APP_DB = env('PUBLIC_APP_DB', 'pockethost-central')
export const PUBLIC_APP_DOMAIN = env('PUBLIC_APP_DOMAIN', 'pockethost.io')
-export const PUBLIC_APP_PROTOCOL = env('PUBLIC_APP_PROTOCOL', 'https')
+export const PUBLIC_HTTP_PROTOCOL = env('PUBLIC_HTTP_PROTOCOL', 'https')
export const PUBLIC_DEBUG = envb('PUBLIC_DEBUG', dev)
diff --git a/packages/dashboard/src/pocketbase/index.ts b/packages/dashboard/src/pocketbase/index.ts
index 502220d4..bfeb6338 100644
--- a/packages/dashboard/src/pocketbase/index.ts
+++ b/packages/dashboard/src/pocketbase/index.ts
@@ -1,5 +1,9 @@
import { browser } from '$app/environment'
-import { PUBLIC_APP_DB, PUBLIC_APP_DOMAIN, PUBLIC_APP_PROTOCOL } from '$src/env'
+import {
+ PUBLIC_APP_DB,
+ PUBLIC_APP_DOMAIN,
+ PUBLIC_HTTP_PROTOCOL,
+} from '$src/env'
import { logger } from '@pockethost/common'
import {
createPocketbaseClient,
@@ -13,7 +17,7 @@ export const client = (() => {
if (clientInstance) return clientInstance
const { info } = logger()
info(`Initializing pocketbase client`)
- const url = `${PUBLIC_APP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}`
+ const url = `${PUBLIC_HTTP_PROTOCOL}://${PUBLIC_APP_DB}.${PUBLIC_APP_DOMAIN}`
clientInstance = createPocketbaseClient({ url })
return clientInstance
}
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte
index 8b61a398..613c2241 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte
@@ -1,6 +1,6 @@