fix: Hostname issue

apps/api/prisma/seed.js

@@ -23,7 +23,8 @@ async function main() {
 		await prisma.setting.create({
 			data: {
 				isRegistrationEnabled: true,
-				isTraefikUsed: true,
+				proxyPassword: encrypt(generatePassword()),
+				proxyUser: cuid()
 			}
 		});
 	} else {
@@ -72,4 +73,16 @@ main()
 	})
 	.finally(async () => {
 		await prisma.$disconnect();
-	});
+	});
+
+const encrypt = (text) => {
+	if (text) {
+		const iv = crypto.randomBytes(16);
+		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
+		const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
+		return JSON.stringify({
+			iv: iv.toString('hex'),
+			content: encrypted.toString('hex')
+		});
+	}
+};

apps/api/src/index.ts

@@ -26,7 +26,8 @@ declare module 'fastify' {
 const port = isDev ? 3001 : 3000;
 const host = '0.0.0.0';
 const fastify = Fastify({
-	logger: false
+	logger: false,
+	trustProxy: true
 });
 const schema = {
 	type: 'object',

apps/api/src/lib/common.ts

@@ -23,7 +23,7 @@ const customConfig: Config = {
 	length: 3
 };
 export const isDev = process.env.NODE_ENV === 'development';
-export const version = '3.0.0';
+export const version = '3.0.3';
 
 export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
 export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
@@ -209,7 +209,7 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
 			resolves = await dns.resolve4(hostname);
 		}
 	} catch (error) {
-		throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
+		throw { status: 500, message: `Could not determine IP address for ${hostname}.` }
 	}
 
 	if (dualCerts) {
@@ -231,9 +231,9 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
 				}
 			}
 			if (ipDomainFound && ipDomainDualCertFound) return { status: 200 };
-			throw false;
+			throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
 		} catch (error) {
-			throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
+			throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
 		}
 	} else {
 		try {
@@ -245,9 +245,9 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
 				}
 			}
 			if (ipDomainFound) return { status: 200 };
-			throw false;
+			throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
 		} catch (error) {
-			throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
+			throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
 		}
 	}
 }

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -324,7 +324,7 @@ export async function checkDNS(request: FastifyRequest<CheckDNS>) {
             }
         }
         if (isDNSCheckEnabled && !isDev && !forceSave) {
-            return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
+            return await checkDomainsIsValidInDNS({ hostname: request.hostname.split(':')[0], fqdn, dualCerts });
         }
         return {}
     } catch ({ status, message }) {

apps/api/src/routes/api/v1/destinations/handlers.ts

@@ -43,7 +43,7 @@ export async function getDestination(request: FastifyRequest) {
         const destination = await prisma.destinationDocker.findFirst({
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }
         });
-        if (!destination) {
+        if (!destination && id !== 'new') {
             throw { status: 404, message: `Destination not found.` };
         }
         const settings = await listSettings();
@@ -62,10 +62,7 @@ export async function getDestination(request: FastifyRequest) {
             // // await saveSshKey(destination);
             // payload.state = await checkContainer(engine, 'coolify-haproxy');
         } else {
-            let containerName = 'coolify-proxy';
+            const containerName = 'coolify-proxy';
-            if (!settings.isTraefikUsed) {
-                containerName = 'coolify-haproxy';
-            }
             payload.state =
                 destination?.engine && (await checkContainer(destination.engine, containerName));
         }

apps/api/src/routes/api/v1/settings/handlers.ts

@@ -67,7 +67,7 @@ export async function checkDomain(request: FastifyRequest, reply: FastifyReply)
             throw "Domain already configured";
         }
         if (isDNSCheckEnabled && !forceSave) {
-            return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
+            return await checkDomainsIsValidInDNS({ hostname: request.hostname.split(':')[0], fqdn, dualCerts });
         }
         return {};
     } catch ({ status, message }) {

apps/ui/src/lib/store.ts

@@ -18,7 +18,7 @@ interface AppSession {
 }
 export const loginEmail: Writable<string | undefined> = writable()
 export const appSession: Writable<AppSession> = writable({
-    version: '3.0.0',
+    version: '3.0.3',
     userId: null,
     teamId: null,
     permission: 'read',

apps/ui/src/routes/applications/[id]/__layout.svelte

@@ -136,6 +136,8 @@
 			statusInterval = setInterval(async () => {
 				await getStatus();
 			}, 2000);
+		} else {
+			$status.application.initialLoading = false;
 		}
 	});
 </script>

apps/ui/src/routes/databases/[id]/__layout.svelte

@@ -126,6 +126,8 @@
 			statusInterval = setInterval(async () => {
 				await getStatus();
 			}, 2000);
+		} else {
+			$status.database.initialLoading = false;
 		}
 	});
 </script>

apps/ui/src/routes/destinations/index.svelte

@@ -22,7 +22,7 @@
 
 	import { t } from '$lib/translations';
 	import { appSession } from '$lib/store';
-	import { get } from '$lib/api';
+	import { get, post } from '$lib/api';
 
 	const ownDestinations = destinations.filter((destination) => {
 		if (destination.teams[0].id === $appSession.teamId) {
@@ -39,7 +39,7 @@
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.destinations')}</div>
 	{#if $appSession.isAdmin}
-		<a href="/destinations/new" class="add-icon bg-sky-600 hover:bg-sky-500">
+	    <a href="/destinations/new" class="add-icon bg-sky-600 hover:bg-sky-500">
 			<svg
 				class="w-6"
 				xmlns="http://www.w3.org/2000/svg"

apps/ui/src/routes/services/[id]/__layout.svelte

@@ -135,6 +135,8 @@
 			statusInterval = setInterval(async () => {
 				await getStatus();
 			}, 2000);
+		} else {
+			$status.service.initialLoading = false;
 		}
 	});
 </script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolify",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
   "license": "AGPL-3.0",
   "scripts": {