feat: use ssh key type

This commit is contained in:
Alan Vasquez 2022-11-20 20:22:44 +00:00
parent f2f261e6bd
commit 6a0bdabd30
4 changed files with 19 additions and 7 deletions

View file

@ -37,19 +37,23 @@ eg: myusername
eg: '59184' eg: '59184'
##### 5. `ARGS` (optional, default '-rltgoDzvO') ##### 5. `REMOTE_KEY_TYPES` (optional, default '+ssh-rsa')
eg: '+ssh-rsa,+ssh-dss'
##### 6. `ARGS` (optional, default '-rltgoDzvO')
For any initial/required rsync flags, eg: `-avzr --delete` For any initial/required rsync flags, eg: `-avzr --delete`
##### 6. `SOURCE` (optional, default '') ##### 7. `SOURCE` (optional, default '')
The source directory, path relative to `$GITHUB_WORKSPACE` root, eg: `dist/` The source directory, path relative to `$GITHUB_WORKSPACE` root, eg: `dist/`
##### 7. `TARGET` (optional, default '/home/REMOTE_USER/') ##### 8. `TARGET` (optional, default '/home/REMOTE_USER/')
The target directory The target directory
##### 8. `EXCLUDE` (optional, default '') ##### 9. `EXCLUDE` (optional, default '')
path to exclude separated by `,`, ie: `/dist/, /node_modules/` path to exclude separated by `,`, ie: `/dist/, /node_modules/`

View file

@ -15,6 +15,10 @@ inputs:
description: "Remote port" description: "Remote port"
required: false required: false
default: "22" default: "22"
REMOTE_KEY_TYPES:
description: "Remote key types"
required: false
default: "+ssh-rsa"
SOURCE: SOURCE:
description: "Source directory" description: "Source directory"
required: false required: false

View file

@ -6,14 +6,18 @@ const { addSshKey } = require('./sshKey');
const { const {
REMOTE_HOST, REMOTE_USER, REMOTE_HOST, REMOTE_USER,
REMOTE_PORT, SSH_PRIVATE_KEY, DEPLOY_KEY_NAME, REMOTE_PORT, REMOTE_KEY_TYPES, SSH_PRIVATE_KEY, DEPLOY_KEY_NAME,
SOURCE, TARGET, ARGS, EXCLUDE, SOURCE, TARGET, ARGS, EXCLUDE,
GITHUB_WORKSPACE GITHUB_WORKSPACE
} = require('./inputs'); } = require('./inputs');
const defaultOptions = { const defaultOptions = {
ssh: true, ssh: true,
sshCmdArgs: ['-o StrictHostKeyChecking=no'], sshCmdArgs: [
'-o StrictHostKeyChecking=no',
`-o HostKeyAlgorithms=${REMOTE_KEY_TYPES || '+ssh-rsa'}`,
`-o PubkeyAcceptedKeyTypes=${REMOTE_KEY_TYPES || '+ssh-rsa'}`,
],
recursive: true recursive: true
}; };

View file

@ -1,4 +1,4 @@
const inputNames = ['REMOTE_HOST', 'REMOTE_USER', 'REMOTE_PORT', 'SSH_PRIVATE_KEY', 'DEPLOY_KEY_NAME', 'SOURCE', 'TARGET', 'ARGS', 'EXCLUDE']; const inputNames = ['REMOTE_HOST', 'REMOTE_USER', 'REMOTE_PORT', 'REMOTE_KEY_TYPES', 'SSH_PRIVATE_KEY', 'DEPLOY_KEY_NAME', 'SOURCE', 'TARGET', 'ARGS', 'EXCLUDE'];
const inputs = { const inputs = {
GITHUB_WORKSPACE: process.env.GITHUB_WORKSPACE GITHUB_WORKSPACE: process.env.GITHUB_WORKSPACE