fix: WP custom db

This commit is contained in:
Andras Bacsai
2022-05-10 18:21:05 +02:00
parent 30781f218c
commit 9586213dd1
3 changed files with 22 additions and 11 deletions

View File

@@ -418,20 +418,27 @@ export async function updateWordpress({
fqdn, fqdn,
name, name,
exposePort, exposePort,
ownMysql,
mysqlDatabase, mysqlDatabase,
extraConfig, extraConfig,
mysqlHost, mysqlHost,
mysqlPort mysqlPort,
mysqlUser,
mysqlPassword
}: { }: {
id: string; id: string;
fqdn: string; fqdn: string;
name: string; name: string;
exposePort?: number; exposePort?: number;
ownMysql: boolean;
mysqlDatabase: string; mysqlDatabase: string;
extraConfig: string; extraConfig: string;
mysqlHost?: string; mysqlHost?: string;
mysqlPort?: number; mysqlPort?: number;
mysqlUser?: string;
mysqlPassword?: string;
}): Promise<Service> { }): Promise<Service> {
mysqlPassword = encrypt(mysqlPassword);
return await prisma.service.update({ return await prisma.service.update({
where: { id }, where: { id },
data: { data: {
@@ -443,6 +450,8 @@ export async function updateWordpress({
mysqlDatabase, mysqlDatabase,
extraConfig, extraConfig,
mysqlHost, mysqlHost,
mysqlUser,
mysqlPassword,
mysqlPort mysqlPort
} }
} }

View File

@@ -175,8 +175,8 @@ define('SUBDOMAIN_INSTALL', false);`
id="mysqlRootUser" id="mysqlRootUser"
placeholder="MySQL {$t('forms.root_user')}" placeholder="MySQL {$t('forms.root_user')}"
value={service.wordpress.mysqlRootUser} value={service.wordpress.mysqlRootUser}
readonly={isRunning || !service.wordpress.ownMysq} readonly={isRunning || !service.wordpress.ownMysql}
disabled={isRunning || !service.wordpress.ownMysq} disabled={isRunning || !service.wordpress.ownMysql}
/> />
</div> </div>
<div class="grid grid-cols-2 items-center px-10"> <div class="grid grid-cols-2 items-center px-10">
@@ -184,8 +184,8 @@ define('SUBDOMAIN_INSTALL', false);`
<CopyPasswordField <CopyPasswordField
id="mysqlRootUserPassword" id="mysqlRootUserPassword"
isPasswordField isPasswordField
readonly={isRunning || !service.wordpress.ownMysq} readonly={isRunning || !service.wordpress.ownMysql}
disabled={isRunning || !service.wordpress.ownMysq} disabled={isRunning || !service.wordpress.ownMysql}
name="mysqlRootUserPassword" name="mysqlRootUserPassword"
value={service.wordpress.mysqlRootUserPassword} value={service.wordpress.mysqlRootUserPassword}
/> />
@@ -196,7 +196,7 @@ define('SUBDOMAIN_INSTALL', false);`
<input <input
name="mysqlUser" name="mysqlUser"
id="mysqlUser" id="mysqlUser"
value={service.wordpress.mysqlUser} bind:value={service.wordpress.mysqlUser}
readonly={isRunning || !service.wordpress.ownMysql} readonly={isRunning || !service.wordpress.ownMysql}
disabled={isRunning || !service.wordpress.ownMysql} disabled={isRunning || !service.wordpress.ownMysql}
/> />
@@ -209,6 +209,6 @@ define('SUBDOMAIN_INSTALL', false);`
readonly={isRunning || !service.wordpress.ownMysql} readonly={isRunning || !service.wordpress.ownMysql}
disabled={isRunning || !service.wordpress.ownMysql} disabled={isRunning || !service.wordpress.ownMysql}
name="mysqlPassword" name="mysqlPassword"
value={service.wordpress.mysqlPassword} bind:value={service.wordpress.mysqlPassword}
/> />
</div> </div>

View File

@@ -12,23 +12,25 @@ export const post: RequestHandler = async (event) => {
name, name,
fqdn, fqdn,
exposePort, exposePort,
wordpress: { extraConfig, mysqlDatabase, mysqlHost, mysqlPort } ownMysql,
wordpress: { extraConfig, mysqlDatabase, mysqlHost, mysqlPort, mysqlUser, mysqlPassword }
} = await event.request.json(); } = await event.request.json();
if (fqdn) fqdn = fqdn.toLowerCase(); if (fqdn) fqdn = fqdn.toLowerCase();
if (exposePort) exposePort = Number(exposePort); if (exposePort) exposePort = Number(exposePort);
if (mysqlPort) mysqlPort = Number(mysqlPort); if (mysqlPort) mysqlPort = Number(mysqlPort);
try { try {
await db.updateWordpress({ await db.updateWordpress({
id, id,
fqdn, fqdn,
name, name,
extraConfig, extraConfig,
ownMysql,
mysqlDatabase, mysqlDatabase,
exposePort, exposePort,
mysqlHost, mysqlHost,
mysqlPort mysqlPort,
mysqlUser,
mysqlPassword
}); });
return { status: 201 }; return { status: 201 };
} catch (error) { } catch (error) {