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
Lorenzo Martinico
slapos
Commits
679ffe9d
Commit
679ffe9d
authored
Sep 13, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: doesn't use same key for sshd as resilient, because it can create conflicts
parent
ea41a867
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+3
-2
No files found.
software/slaprunner/common.cfg
View file @
679ffe9d
...
@@ -54,7 +54,7 @@ mode = 0644
...
@@ -54,7 +54,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
c82bdb066b61846f159c2d49a21eb7e9
md5sum =
8833cc43e6ce808b646bd92f67e57d53
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
...
software/slaprunner/instance-runner.cfg
View file @
679ffe9d
...
@@ -211,13 +211,14 @@ ip = $${slap-network-information:global-ipv6}
...
@@ -211,13 +211,14 @@ ip = $${slap-network-information:global-ipv6}
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered = $${directory:etc}/runner-sshd.conf
rendered = $${directory:etc}/runner-sshd.conf
path_pid = $${directory:run}/runner-sshd.pid
path_pid = $${directory:run}/runner-sshd.pid
host_key = $${directory:ssh}/runner_server_key.rsa
template = inline:
template = inline:
PidFile $${:path_pid}
PidFile $${:path_pid}
Port $${runner-sshd-port:port}
Port $${runner-sshd-port:port}
ListenAddress $${slap-network-information:global-ipv6}
ListenAddress $${slap-network-information:global-ipv6}
Protocol 2
Protocol 2
UsePrivilegeSeparation no
UsePrivilegeSeparation no
HostKey $${
directory:ssh}/server_key.rsa
HostKey $${
:host_key}
PasswordAuthentication no
PasswordAuthentication no
PubkeyAuthentication yes
PubkeyAuthentication yes
AuthorizedKeysFile $${buildout:directory}/.ssh/authorized_keys
AuthorizedKeysFile $${buildout:directory}/.ssh/authorized_keys
...
@@ -226,7 +227,7 @@ template = inline:
...
@@ -226,7 +227,7 @@ template = inline:
[runner-sshd-raw-server]
[runner-sshd-raw-server]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
host = $${slap-network-information:global-ipv6}
host = $${slap-network-information:global-ipv6}
rsa-keyfile = $${
directory:ssh}/server_key.rsa
rsa-keyfile = $${
runner-sshd-config:host_key}
home = $${directory:ssh}
home = $${directory:ssh}
command-line = ${openssh:location}/sbin/sshd -D -e -f $${runner-sshd-config:rendered}
command-line = ${openssh:location}/sbin/sshd -D -e -f $${runner-sshd-config:rendered}
wrapper-path = $${directory:bin}/runner_raw_sshd
wrapper-path = $${directory:bin}/runner_raw_sshd
...
...
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