Browse Source

feat: add ssh port override option for git module (#1432)

* Adding an override for the ssh port

* fix: git module - ssh custom port

Co-authored-by: Nicolas Giard <github@ngpixel.com>
pull/1447/head
wallrick 4 years ago
committed by GitHub
parent
commit
b1c7edac90
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
  1. 6
      server/modules/storage/git/definition.yml
  2. 5
      server/modules/storage/git/storage.js

6
server/modules/storage/git/definition.yml

@ -93,6 +93,12 @@ props:
default: ''
hint: Optional - Absolute path to the Git binary, when not available in PATH. Leave empty to use the default PATH location (recommended).
order: 50
sshPort:
type: Number
title: SSH Port
default: 22
hint: Optional - SSH Authentication Only - Allows overriding ssh default port.
order: 60
actions:
- handler: syncUntracked
label: Add Untracked Changes

5
server/modules/storage/git/storage.js

@ -77,7 +77,10 @@ module.exports = {
throw err
}
}
await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no`)
if (this.config.sshPort <= 0) {
this.config.sshPort = 22
}
await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no -p ${this.config.sshPort}`)
WIKI.logger.info('(STORAGE/GIT) Adding origin remote via SSH...')
await this.git.addRemote('origin', this.config.repoUrl)
break

Loading…
Cancel
Save