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
Iliya Manolov
slapos
Commits
9b761c7b
Commit
9b761c7b
authored
Sep 20, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 1.0
parents
7a089783
8c400530
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
24 deletions
+24
-24
slapos/recipe/pbs.py
slapos/recipe/pbs.py
+1
-1
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
+4
-4
stack/resilient/instance-pull-backup.cfg.in
stack/resilient/instance-pull-backup.cfg.in
+4
-4
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.
slapos/recipe/pbs.py
View file @
9b761c7b
...
...
@@ -44,7 +44,7 @@ def promise(args):
with
open
(
"/dev/null"
)
as
_dev_null
:
ssh
=
subprocess
.
Popen
(
[
args
[
'ssh_client'
],
'%(user)s@%(host)s'
%
args
,
'-p'
,
'%(port)s'
%
args
],
stdin
=
subprocess
.
PIPE
,
stdout
=
_dev_null
,
stderr
=
_dev_null
stdin
=
subprocess
.
PIPE
,
stdout
=
_dev_null
,
stderr
=
None
)
# Rdiff Backup protocol quit command
...
...
software/slaprunner/common.cfg
View file @
9b761c7b
...
...
@@ -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]
...
...
software/slaprunner/instance-runner.cfg
View file @
9b761c7b
...
...
@@ -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]
...
...
stack/resilient/buildout.cfg
View file @
9b761c7b
...
...
@@ -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,14 +59,14 @@ 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]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg
md5sum =
098a9c266fe7256455f079af112f9149
md5sum =
683d178a7ebb60b949d638120dce19ca
mode = 0644
[template-replicated]
...
...
stack/resilient/instance-pull-backup.cfg.in
View file @
9b761c7b
...
...
@@ -6,7 +6,7 @@ parts =
logrotate
cron
cron-entry-logrotate
sshkeys-authority
pbs-
sshkeys-authority
sshkeys-openssh
backup-transfer-integrity-promise
resilient-genstatrss-wrapper
...
...
@@ -212,15 +212,15 @@ recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests
keys = $${directory:sshkeys}/keys
[sshkeys-authority]
[
pbs-
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}/
pbs_
sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen
[sshkeys-openssh]
<= sshkeys-authority
<=
pbs-
sshkeys-authority
recipe = slapos.cookbook:sshkeys_authority.request
name = pbs-client
type = rsa
...
...
stack/resilient/pbsready-export.cfg.in
View file @
9b761c7b
...
...
@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-
sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
...
...
stack/resilient/pbsready-import.cfg.in
View file @
9b761c7b
...
...
@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-
sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
...
...
stack/resilient/pbsready.cfg.in
View file @
9b761c7b
...
...
@@ -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
...
...
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