{database.name}
From 3990bebca31eff372c815e346f58d41080348535 Mon Sep 17 00:00:00 2001
From: Ikechukwu Eze <92305839+ikezedev@users.noreply.github.com>
Date: Sun, 31 Jul 2022 19:50:25 +0200
Subject: [PATCH 02/26] add to supported databases
---
apps/api/src/lib/common.ts | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index b18bfd003..656075d8e 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -467,7 +467,13 @@ export const supportedDatabaseTypesAndVersions = [
baseImage: 'bitnami/redis',
versions: ['6.2', '6.0', '5.0']
},
- { name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.1'] }
+ { name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.1'] },
+ {
+ name: 'edgedb',
+ fancyName: 'EdgeDB',
+ baseImage: 'edgedb/edgedb',
+ versions: ['2.0', '1.4'],
+ }
];
export async function startTraefikProxy(engine: string): Promise
{
@@ -693,6 +699,17 @@ export function generateDatabaseConfiguration(database: any):
COUCHDB_PASSWORD: string;
COUCHDB_USER: string;
};
+ }
+ | {
+ volume: string;
+ image: string;
+ ulimits: Record;
+ privatePort: number;
+ environmentVariables: {
+ EDGEDB_SERVER_PASSWORD: string;
+ EDGEDB_SERVER_USER: string;
+ EDGEDB_SERVER_DATABASE: string;
+ };
} {
const {
id,
@@ -780,6 +797,18 @@ export function generateDatabaseConfiguration(database: any):
volume: `${id}-${type}-data:/bitnami/couchdb`,
ulimits: {}
};
+ } else if (type === 'edgedb') {
+ return {
+ privatePort: 5656,
+ environmentVariables: {
+ EDGEDB_SERVER_PASSWORD: rootUserPassword,
+ EDGEDB_SERVER_USER: rootUser,
+ EDGEDB_SERVER_DATABASE: defaultDatabase,
+ },
+ image: `${baseImage}:${version}`,
+ volume: `${id}-${type}-data:/edgedb/edgedb`,
+ ulimits: {},
+ };
}
}
From 7ed1ced5211078e08ab5acf066d69dd401d36fb1 Mon Sep 17 00:00:00 2001
From: Ikechukwu Eze <92305839+ikezedev@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:11:13 +0200
Subject: [PATCH 03/26] insecure mode
---
apps/api/src/lib/common.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 30743af3c..b698fc12c 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -739,6 +739,7 @@ export function generateDatabaseConfiguration(database: any):
EDGEDB_SERVER_PASSWORD: string;
EDGEDB_SERVER_USER: string;
EDGEDB_SERVER_DATABASE: string;
+ EDGEDB_SERVER_SECURITY: string;
};
} {
const {
@@ -834,6 +835,7 @@ export function generateDatabaseConfiguration(database: any):
EDGEDB_SERVER_PASSWORD: rootUserPassword,
EDGEDB_SERVER_USER: rootUser,
EDGEDB_SERVER_DATABASE: defaultDatabase,
+ EDGEDB_SERVER_SECURITY: 'insecure_dev_mode'
},
image: `${baseImage}:${version}`,
volume: `${id}-${type}-data:/edgedb/edgedb`,
From adc5965b32ca7510899c64fce00a676772217858 Mon Sep 17 00:00:00 2001
From: Andras Bacsai
Date: Wed, 7 Sep 2022 08:57:32 +0200
Subject: [PATCH 04/26] fix: use ip address instead of window location
---
apps/ui/src/routes/sources/[id]/_Github.svelte | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/ui/src/routes/sources/[id]/_Github.svelte b/apps/ui/src/routes/sources/[id]/_Github.svelte
index e9b229290..c98ee4f4f 100644
--- a/apps/ui/src/routes/sources/[id]/_Github.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Github.svelte
@@ -46,8 +46,8 @@
customPort: source.customPort
});
const { organization, htmlUrl } = source;
- const { fqdn } = settings;
- const host = dev ? getAPIUrl() : fqdn ? fqdn : `http://${window.location.host}` || '';
+ const { fqdn, ipv4, ipv6 } = settings;
+ const host = dev ? getAPIUrl() : fqdn ? fqdn : `http://${ipv4 || ipv6}` || '';
const domain = getDomain(fqdn);
let url = 'settings/apps/new';
From 3f2dcccc07e1fae16c06f820eea02ad59043271a Mon Sep 17 00:00:00 2001
From: Andras Bacsai
Date: Wed, 7 Sep 2022 08:58:27 +0200
Subject: [PATCH 05/26] fix: use ip instead of window location host
---
apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte b/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte
index 474aa2f13..29f9a1ca3 100644
--- a/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte
@@ -12,7 +12,7 @@
export let readOnly: any;
export let settings: any;
const { id } = $page.params;
-
+ const { ipv4, ipv6 } = settings;
let ftpUrl = generateUrl(service.wordpress.ftpPublicPort);
let ftpUser = service.wordpress.ftpUser;
let ftpPassword = service.wordpress.ftpPassword;
@@ -22,7 +22,7 @@
function generateUrl(publicPort: any) {
return browser
? `sftp://${
- settings?.fqdn ? getDomain(settings.fqdn) : window.location.hostname
+ settings?.fqdn ? getDomain(settings.fqdn) : ipv4 || ipv6
}:${publicPort}`
: 'Loading...';
}
From 7e0a1ecc808139bf941848da0b23ddb2578b3b4c Mon Sep 17 00:00:00 2001
From: Andras Bacsai
Date: Wed, 7 Sep 2022 08:58:40 +0200
Subject: [PATCH 06/26] ui: fix login/register page
---
apps/ui/src/routes/login.svelte | 2 +-
apps/ui/src/routes/register.svelte | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/ui/src/routes/login.svelte b/apps/ui/src/routes/login.svelte
index 40f5fc2fe..9b68b6d11 100644
--- a/apps/ui/src/routes/login.svelte
+++ b/apps/ui/src/routes/login.svelte
@@ -70,7 +70,7 @@