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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
0f441e98
Commit
0f441e98
authored
8 years ago
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resilient & slaprunner: force the upgrade of openssh keys
parent
bdf529da
No related merge requests found
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
18 deletions
+18
-18
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+6
-6
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+3
-3
stack/resilient/pbsready-export.cfg.in
stack/resilient/pbsready-export.cfg.in
+1
-1
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+1
-1
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+6
-6
No files found.
software/slaprunner/common.cfg
View file @
0f441e98
...
...
@@ -54,7 +54,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
26a58e69c4c59d30c9e2f50075cdc679
md5sum =
71ce5a39bf61ae5f80a10c27b9c12761
mode = 0644
[template-runner-import-script]
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-runner.cfg
View file @
0f441e98
...
...
@@ -251,16 +251,16 @@ recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/killpidfromfile $${runner-sshd-config:path_pid} SIGHUP
wrapper-path = $${directory:scripts}/runner-sshd-graceful
[sshkeys-directory]
[
runner-
sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests/
keys = $${directory:sshkeys}/keys/
requests = $${directory:sshkeys}/r
unner-r
equests/
keys = $${directory:sshkeys}/
runner-
keys/
[runner-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys}
wrapper = $${directory:services}/sshkeys_authority
request-directory = $${
runner-
sshkeys-directory:requests}
keys-directory = $${
runner-
sshkeys-directory:keys}
wrapper = $${directory:services}/
runner_
sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen
[runner-sshkeys-sshd]
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/buildout.cfg
View file @
0f441e98
...
...
@@ -41,7 +41,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum =
fee06ab268015b394ec49cb4600de1ed
md5sum =
3dddf84daf5db8ff4ffc3878e206b467
mode = 0644
[pbsready-import]
...
...
@@ -50,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
md5sum =
89619b0d8626c76402a11bb08e7ba8a1
md5sum =
a13be3bd76d6a52b6527c7035ba33a06
mode = 0644
[pbsready-export]
...
...
@@ -59,7 +59,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg
md5sum =
48cf26431ab052eae8227efd457db8c3
md5sum =
cb2537598981a1a4af0dea05cc6ac6bd
mode = 0644
[template-pull-backup]
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/pbsready-export.cfg.in
View file @
0f441e98
...
...
@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-
sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/pbsready-import.cfg.in
View file @
0f441e98
...
...
@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-
sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/pbsready.cfg.in
View file @
0f441e98
...
...
@@ -6,7 +6,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-
sshkeys-authority
sshd-graceful
sshkeys-sshd
sshd-promise
...
...
@@ -229,18 +229,18 @@ port = $${sshd-port:port}
[sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests
keys = $${directory:sshkeys}/keys
requests = $${directory:sshkeys}/re
silient-re
quests
keys = $${directory:sshkeys}/
resilient-
keys
[sshkeys-authority]
[
resilient-
sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys}
wrapper = $${basedirectory:services}/sshkeys_authority
wrapper = $${basedirectory:services}/
resilient_
sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen
[sshkeys-sshd]
<= sshkeys-authority
<=
resilient-
sshkeys-authority
recipe = slapos.cookbook:sshkeys_authority.request
name = sshd
type = rsa
...
...
This diff is collapsed.
Click to expand it.
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