diff --git a/blueprint.py b/blueprint.py index 93d21da5..9fd76412 100644 --- a/blueprint.py +++ b/blueprint.py @@ -8,7 +8,7 @@ import base64 YAML_FILE_PATH = 'blueprint.yaml' # The API endpoint and headers from the curl request -API_URL = 'http://api.pangolin.fossorial.io/v1/org/test/blueprint' +API_URL = 'http://api.pangolin.net/v1/org/test/blueprint' HEADERS = { 'accept': '*/*', 'Authorization': 'Bearer ', diff --git a/server/private/lib/readConfigFile.ts b/server/private/lib/readConfigFile.ts index 71613f5f..20712704 100644 --- a/server/private/lib/readConfigFile.ts +++ b/server/private/lib/readConfigFile.ts @@ -76,7 +76,7 @@ export const privateConfigSchema = z.object({ local_exit_node_reachable_at: z .string() .optional() - .default("http://gerbil:3003") + .default("http://gerbil:3004") }) .optional() .default({}), diff --git a/server/private/lib/traefik/getTraefikConfig.ts b/server/private/lib/traefik/getTraefikConfig.ts index c7b0f681..3392fbd5 100644 --- a/server/private/lib/traefik/getTraefikConfig.ts +++ b/server/private/lib/traefik/getTraefikConfig.ts @@ -120,19 +120,11 @@ export async function getTraefikConfig( and( eq(targets.enabled, true), eq(resources.enabled, true), - or( - eq(sites.exitNodeId, exitNodeId), - and( - isNull(sites.exitNodeId), - sql`(${siteTypes.includes("local") ? 1 : 0} = 1)` // only allow local sites if "local" is in siteTypes - ) - ), or( ne(targetHealthCheck.hcHealth, "unhealthy"), // Exclude unhealthy targets isNull(targetHealthCheck.hcHealth) // Include targets with no health check record ), inArray(sites.type, siteTypes), - // lets rewrite this using sql config.getRawConfig().traefik.allow_raw_resources ? isNotNull(resources.http) // ignore the http check if allow_raw_resources is true : eq(resources.http, true)