Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: escape new line chars in wp custom configs

Browse Source
This commit is contained in:
Andras Bacsai 2023-02-17 15:00:29 +01:00
parent 63ec2a33ae
commit bb6925920f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/api/src/routes/api/v1/services/handlers.ts
View File

@ -746,7 +746,7 @@ export async function saveService(request: FastifyRequest<SaveService>, reply: F
let { id: settingId, name, value, changed = false, isNew = false, variableName } = setting; let { id: settingId, name, value, changed = false, isNew = false, variableName } = setting;
if (value) { if (value) {
if (changed) { if (changed) {
await prisma.serviceSetting.update({ where: { id: settingId }, data: { value } }); await prisma.serviceSetting.update({ where: { id: settingId }, data: { value: value.replace(/\n/, "\\n") } });
} }
if (isNew) { if (isNew) {
if (!variableName) { if (!variableName) {
@ -1101,17 +1101,14 @@ export async function activateWordpressFtp(
shell: true shell: true
}); });
} }
} catch (error) {} } catch (error) { }
const volumes = [ const volumes = [
`${id}-wordpress-data:/home/${ftpUser}/wordpress`, `${id}-wordpress-data:/home/${ftpUser}/wordpress`,
`${ `${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
}/${id}.ed25519:/etc/ssh/ssh_host_ed25519_key`, }/${id}.ed25519:/etc/ssh/ssh_host_ed25519_key`,
`${ `${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
}/${id}.rsa:/etc/ssh/ssh_host_rsa_key`, }/${id}.rsa:/etc/ssh/ssh_host_rsa_key`,
`${ `${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
}/${id}.sh:/etc/sftp.d/chmod.sh` }/${id}.sh:/etc/sftp.d/chmod.sh`
]; ];
@ -1181,6 +1178,6 @@ export async function activateWordpressFtp(
await executeCommand({ await executeCommand({
command: `rm -fr ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub ${hostkeyDir}/${id}.sh` command: `rm -fr ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub ${hostkeyDir}/${id}.sh`
}); });
} catch (error) {} } catch (error) { }
} }
} }