Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
2213ba2c
Commit
2213ba2c
authored
Apr 21, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: git custom ssh port not handled
parent
02816b68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
definition.yml
server/modules/storage/git/definition.yml
+1
-1
storage.js
server/modules/storage/git/storage.js
+1
-1
No files found.
server/modules/storage/git/definition.yml
View file @
2213ba2c
...
...
@@ -97,7 +97,7 @@ props:
type
:
Number
title
:
SSH Port
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
actions
:
-
handler
:
syncUntracked
...
...
server/modules/storage/git/storage.js
View file @
2213ba2c
...
...
@@ -77,7 +77,7 @@ module.exports = {
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
}
await
this
.
git
.
addConfig
(
'core.sshCommand'
,
`ssh -i "
${
this
.
config
.
sshPrivateKeyPath
}
" -o StrictHostKeyChecking=no -p
${
this
.
config
.
sshPort
}
`
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment