Commit 9b761c7b authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into 1.0

parents 7a089783 8c400530
...@@ -44,7 +44,7 @@ def promise(args): ...@@ -44,7 +44,7 @@ def promise(args):
with open("/dev/null") as _dev_null: with open("/dev/null") as _dev_null:
ssh = subprocess.Popen( ssh = subprocess.Popen(
[args['ssh_client'], '%(user)s@%(host)s' % args, '-p', '%(port)s' % args], [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 # Rdiff Backup protocol quit command
......
...@@ -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 = 26a58e69c4c59d30c9e2f50075cdc679 md5sum = 71ce5a39bf61ae5f80a10c27b9c12761
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
......
...@@ -251,16 +251,16 @@ recipe = slapos.cookbook:wrapper ...@@ -251,16 +251,16 @@ recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/killpidfromfile $${runner-sshd-config:path_pid} SIGHUP command-line = $${directory:bin}/killpidfromfile $${runner-sshd-config:path_pid} SIGHUP
wrapper-path = $${directory:scripts}/runner-sshd-graceful wrapper-path = $${directory:scripts}/runner-sshd-graceful
[sshkeys-directory] [runner-sshkeys-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests/ requests = $${directory:sshkeys}/runner-requests/
keys = $${directory:sshkeys}/keys/ keys = $${directory:sshkeys}/runner-keys/
[runner-sshkeys-authority] [runner-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests} request-directory = $${runner-sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys} keys-directory = $${runner-sshkeys-directory:keys}
wrapper = $${directory:services}/sshkeys_authority wrapper = $${directory:services}/runner_sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen keygen-binary = ${openssh:location}/bin/ssh-keygen
[runner-sshkeys-sshd] [runner-sshkeys-sshd]
......
...@@ -41,7 +41,7 @@ eggs = ...@@ -41,7 +41,7 @@ eggs =
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg output = ${buildout:directory}/pbsready.cfg
md5sum = fee06ab268015b394ec49cb4600de1ed md5sum = 3dddf84daf5db8ff4ffc3878e206b467
mode = 0644 mode = 0644
[pbsready-import] [pbsready-import]
...@@ -50,7 +50,7 @@ mode = 0644 ...@@ -50,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg output = ${buildout:directory}/pbsready-import.cfg
md5sum = 89619b0d8626c76402a11bb08e7ba8a1 md5sum = a13be3bd76d6a52b6527c7035ba33a06
mode = 0644 mode = 0644
[pbsready-export] [pbsready-export]
...@@ -59,14 +59,14 @@ mode = 0644 ...@@ -59,14 +59,14 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-export.cfg.in url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg output = ${buildout:directory}/pbsready-export.cfg
md5sum = 48cf26431ab052eae8227efd457db8c3 md5sum = cb2537598981a1a4af0dea05cc6ac6bd
mode = 0644 mode = 0644
[template-pull-backup] [template-pull-backup]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg output = ${buildout:directory}/instance-pull-backup.cfg
md5sum = 098a9c266fe7256455f079af112f9149 md5sum = 683d178a7ebb60b949d638120dce19ca
mode = 0644 mode = 0644
[template-replicated] [template-replicated]
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
logrotate logrotate
cron cron
cron-entry-logrotate cron-entry-logrotate
sshkeys-authority pbs-sshkeys-authority
sshkeys-openssh sshkeys-openssh
backup-transfer-integrity-promise backup-transfer-integrity-promise
resilient-genstatrss-wrapper resilient-genstatrss-wrapper
...@@ -212,15 +212,15 @@ recipe = slapos.cookbook:mkdirectory ...@@ -212,15 +212,15 @@ recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests requests = $${directory:sshkeys}/requests
keys = $${directory:sshkeys}/keys keys = $${directory:sshkeys}/keys
[sshkeys-authority] [pbs-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests} request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys} keys-directory = $${sshkeys-directory:keys}
wrapper = $${basedirectory:services}/sshkeys_authority wrapper = $${basedirectory:services}/pbs_sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen keygen-binary = ${openssh:location}/bin/ssh-keygen
[sshkeys-openssh] [sshkeys-openssh]
<= sshkeys-authority <= pbs-sshkeys-authority
recipe = slapos.cookbook:sshkeys_authority.request recipe = slapos.cookbook:sshkeys_authority.request
name = pbs-client name = pbs-client
type = rsa type = rsa
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue logrotate-entry-equeue
cron cron
cron-entry-logrotate cron-entry-logrotate
sshkeys-authority resilient-sshkeys-authority
sshd-raw-server sshd-raw-server
sshd-graceful sshd-graceful
sshkeys-sshd sshkeys-sshd
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue logrotate-entry-equeue
cron cron
cron-entry-logrotate cron-entry-logrotate
sshkeys-authority resilient-sshkeys-authority
sshd-raw-server sshd-raw-server
sshd-graceful sshd-graceful
sshkeys-sshd sshkeys-sshd
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
logrotate-entry-equeue logrotate-entry-equeue
cron cron
cron-entry-logrotate cron-entry-logrotate
sshkeys-authority resilient-sshkeys-authority
sshd-graceful sshd-graceful
sshkeys-sshd sshkeys-sshd
sshd-promise sshd-promise
...@@ -229,18 +229,18 @@ port = $${sshd-port:port} ...@@ -229,18 +229,18 @@ port = $${sshd-port:port}
[sshkeys-directory] [sshkeys-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests requests = $${directory:sshkeys}/resilient-requests
keys = $${directory:sshkeys}/keys keys = $${directory:sshkeys}/resilient-keys
[sshkeys-authority] [resilient-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests} request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys} keys-directory = $${sshkeys-directory:keys}
wrapper = $${basedirectory:services}/sshkeys_authority wrapper = $${basedirectory:services}/resilient_sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen keygen-binary = ${openssh:location}/bin/ssh-keygen
[sshkeys-sshd] [sshkeys-sshd]
<= sshkeys-authority <= resilient-sshkeys-authority
recipe = slapos.cookbook:sshkeys_authority.request recipe = slapos.cookbook:sshkeys_authority.request
name = sshd name = sshd
type = rsa type = rsa
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment