Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Aurélien Vermylen
slapos
Commits
7053ac66
Commit
7053ac66
authored
Sep 23, 2014
by
Rafael Monnerat
Committed by
Marco Mariani
Oct 15, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resilience: Increase timeout for ssh server and client to 5 minutes.
parent
10e156c9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
slapos/recipe/dropbear.py
slapos/recipe/dropbear.py
+2
-0
slapos/recipe/pbs.py
slapos/recipe/pbs.py
+1
-1
No files found.
slapos/recipe/dropbear.py
View file @
7053ac66
...
@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
...
@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
dropbear_cmd
.
extend
([
'-p'
,
binding_address
])
dropbear_cmd
.
extend
([
'-p'
,
binding_address
])
# Single user mode
# Single user mode
dropbear_cmd
.
append
(
'-n'
)
dropbear_cmd
.
append
(
'-n'
)
# Keep connection alive for 5 minutes
dropbear_cmd
.
extend
([
'-K'
,
'300'
])
if
'dss-keyfile'
in
self
.
options
:
if
'dss-keyfile'
in
self
.
options
:
dropbear_cmd
.
extend
([
'-d'
,
self
.
options
[
'dss-keyfile'
]])
dropbear_cmd
.
extend
([
'-d'
,
self
.
options
[
'dss-keyfile'
]])
...
...
slapos/recipe/pbs.py
View file @
7053ac66
...
@@ -101,7 +101,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -101,7 +101,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
# XXX use -y because the host might not yet be in the
# XXX use -y because the host might not yet be in the
# trusted hosts file until the next time slapgrid is run.
# trusted hosts file until the next time slapgrid is run.
rdiffbackup_remote_schema
=
'%(ssh)s -y -p %%s %(user)s@%(host)s'
%
{
rdiffbackup_remote_schema
=
'%(ssh)s -y -
K 300 -
p %%s %(user)s@%(host)s'
%
{
'ssh'
:
self
.
options
[
'sshclient-binary'
],
'ssh'
:
self
.
options
[
'sshclient-binary'
],
'user'
:
parsed_url
.
username
,
'user'
:
parsed_url
.
username
,
'host'
:
parsed_url
.
hostname
,
'host'
:
parsed_url
.
hostname
,
...
...
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