liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: git custom ssh port not handled

Browse Source
This commit is contained in:
NGPixel 2020-04-21 19:45:25 -04:00
parent 02816b68d0
commit 2213ba2c81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/storage/git/definition.yml
View File

@ -97,7 +97,7 @@ props:
type: Number type: Number
title: SSH Port title: SSH Port
default: 22 default: 22
hint: Optional - SSH Authentication Only - Allows overriding ssh default port. hint: Optional - SSH Authentication Only - Allows overriding ssh default port (22).
order: 60 order: 60
actions: actions:
- handler: syncUntracked - handler: syncUntracked

2
server/modules/storage/git/storage.js
View File

@ -77,7 +77,7 @@ module.exports = {
throw err throw err
} }
} }
if (!this.config.sshPort || !_.isSafeInteger(this.config.sshPort) || this.config.sshPort <= 0) { if (!this.config.sshPort || (_.isString(this.config.sshPort) && _.isEmpty(this.config.sshPort.length)) || (_.isSafeInteger(this.config.sshPort) && this.config.sshPort <= 0)) {
this.config.sshPort = 22 this.config.sshPort = 22
} }
await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no -p ${this.config.sshPort}`) await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no -p ${this.config.sshPort}`)