diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts index 2d1c91775..7c54b5856 100644 --- a/apps/api/src/routes/webhooks/traefik/handlers.ts +++ b/apps/api/src/routes/webhooks/traefik/handlers.ts @@ -2,6 +2,7 @@ import { FastifyRequest } from 'fastify'; import { errorHandler, getDomain, isDev, prisma, executeCommand } from '../../../lib/common'; import { getTemplates } from '../../../lib/services'; import { OnlyId } from '../../../types'; +import { parseAndFindServiceTemplates } from '../../api/v1/services/handlers'; function generateServices(serviceId, containerId, port, isHttp2 = false, isHttps = false) { if (isHttp2) { @@ -534,11 +535,11 @@ export async function proxyConfiguration(request: FastifyRequest, remote if (!found) { continue; } - found = JSON.parse(JSON.stringify(found).replaceAll('$$id', id)); + found = await parseAndFindServiceTemplates(service, null, true); for (const oneService of Object.keys(found.services)) { - const isDomainConfiguration = - found?.services[oneService]?.proxy?.filter((p) => p.domain) ?? []; - if (isDomainConfiguration.length > 0) { + const isDomainAndProxyConfiguration = + found?.services[oneService]?.proxy?.filter((p) => p.domain && p.port) ?? []; + if (isDomainAndProxyConfiguration.length > 0) { const { proxy } = found.services[oneService]; for (let configuration of proxy) { if (configuration.domain) { diff --git a/apps/api/src/routes/webhooks/traefik/index.ts b/apps/api/src/routes/webhooks/traefik/index.ts index 36ce68df0..ed7298ef9 100644 --- a/apps/api/src/routes/webhooks/traefik/index.ts +++ b/apps/api/src/routes/webhooks/traefik/index.ts @@ -4,9 +4,11 @@ import { proxyConfiguration, otherProxyConfiguration } from './handlers'; import { OtherProxyConfiguration } from './types'; const root: FastifyPluginAsync = async (fastify): Promise => { - fastify.get('/main.json', async (request, reply) => proxyConfiguration(request, false)); - fastify.get('/remote/:id', async (request) => proxyConfiguration(request, true)); - fastify.get('/other.json', async (request, reply) => otherProxyConfiguration(request)); + fastify.get('/main.json', async (request, reply) => proxyConfiguration(request, false)); + fastify.get('/remote/:id', async (request) => proxyConfiguration(request, true)); + fastify.get('/other.json', async (request, reply) => + otherProxyConfiguration(request) + ); }; export default root; diff --git a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte index 3f832a3f5..568e5b956 100644 --- a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte +++ b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte @@ -6,7 +6,6 @@ let extension = 'png'; let svgs = [ 'mattermost', - 'repman', 'directus', 'pocketbase', 'gitea', diff --git a/apps/ui/src/routes/services/[id]/configuration/type.svelte b/apps/ui/src/routes/services/[id]/configuration/type.svelte index 55073342a..cef483714 100644 --- a/apps/ui/src/routes/services/[id]/configuration/type.svelte +++ b/apps/ui/src/routes/services/[id]/configuration/type.svelte @@ -34,6 +34,7 @@ import { page } from '$app/stores'; import { get, post } from '$lib/api'; import { errorNotification } from '$lib/common'; + import Beta from '$lib/components/Beta.svelte'; import ServiceIcons from '$lib/components/svg/services/ServiceIcons.svelte'; import { onMount } from 'svelte'; @@ -116,12 +117,15 @@
- {#each sortMe(filteredServices).filter(s=> !s.ignore) as service} + {#each sortMe(filteredServices).filter((s) => !s.ignore) as service} {#key service.name}