cicd/ssh-deploy
1
0
Fork 0
mirror of https://github.com/easingthemes/ssh-deploy.git synced 2025-10-31 23:40:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix ssh command server

Browse Source
This commit is contained in:
Dragan Filipovic 2023-01-02 02:13:02 +01:00
parent 668af68aa1
commit 0172041408
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/index.js
View File

@ -11,7 +11,7 @@ const run = () => {
deployKeyName, sshPrivateKey, deployKeyName, sshPrivateKey,
args, exclude, sshCmdArgs, args, exclude, sshCmdArgs,
scriptBefore, scriptAfter, scriptBefore, scriptAfter,
sshServer rsyncServer
} = inputs; } = inputs;
// Validate required inputs // Validate required inputs
validateRequiredInputs({ sshPrivateKey, remoteHost, remoteUser }); validateRequiredInputs({ sshPrivateKey, remoteHost, remoteUser });
@ -30,7 +30,7 @@ const run = () => {
} }
/* eslint-disable object-property-newline */ /* eslint-disable object-property-newline */
sshDeploy({ sshDeploy({
source, sshServer, exclude, remotePort, source, rsyncServer, exclude, remotePort,
privateKey, args, sshCmdArgs, callback privateKey, args, sshCmdArgs, callback
}); });
}; };

3
src/inputs.js
View File

@ -42,6 +42,7 @@ inputNames.forEach((input) => {
inputs[inputName] = extendedVal; inputs[inputName] = extendedVal;
}); });
inputs.sshServer = `${inputs.remoteUser}@${inputs.remoteHost}:${inputs.target}`; inputs.sshServer = `${inputs.remoteUser}@${inputs.remoteHost}`;
inputs.rsyncServer = `${inputs.remoteUser}@${inputs.remoteHost}:${inputs.target}`;
module.exports = inputs; module.exports = inputs;

6
src/rsyncCli.js
View File

@ -29,10 +29,10 @@ const validateRsync = new Promise(async (resolve, reject) => {
}); });
const rsyncCli = ({ const rsyncCli = ({
source, sshServer, exclude, remotePort, source, rsyncServer, exclude, remotePort,
privateKey, args, sshCmdArgs, callback privateKey, args, sshCmdArgs, callback
}) => { }) => {
console.log(`[Rsync] Starting Rsync Action: ${source} to ${sshServer}`); console.log(`[Rsync] Starting Rsync Action: ${source} to ${rsyncServer}`);
if (exclude) console.log(`[Rsync] excluding folders ${exclude}`); if (exclude) console.log(`[Rsync] excluding folders ${exclude}`);
const defaultOptions = { const defaultOptions = {
@ -45,7 +45,7 @@ const rsyncCli = ({
/* eslint-disable object-property-newline */ /* eslint-disable object-property-newline */
nodeRsync({ nodeRsync({
...defaultOptions, ...defaultOptions,
src: source, dest: sshServer, excludeFirst: exclude, port: remotePort, src: source, dest: rsyncServer, excludeFirst: exclude, port: remotePort,
privateKey, args, sshCmdArgs, privateKey, args, sshCmdArgs,
}, (error, stdout, stderr, cmd) => { }, (error, stdout, stderr, cmd) => {
if (error) { if (error) {