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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
e97d8500
Commit
e97d8500
authored
Sep 12, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resilient: get slapuser from slap-configuration instead of environment
parent
123c7e2a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+1
-1
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+1
-4
No files found.
stack/resilient/buildout.cfg
View file @
e97d8500
...
@@ -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 =
28590ed58034cd5228e7f2cb2e79df94
md5sum =
1e1bb90f4a919bbceb1a81ae2a1452a1
mode = 0644
mode = 0644
[pbsready-import]
[pbsready-import]
...
...
stack/resilient/pbsready.cfg.in
View file @
e97d8500
...
@@ -261,9 +261,6 @@ input = inline:#!${bash:location}/bin/bash
...
@@ -261,9 +261,6 @@ input = inline:#!${bash:location}/bin/bash
output = $${basedirectory:promises}/public-key-existence
output = $${basedirectory:promises}/public-key-existence
mode = 700
mode = 700
[environment]
recipe = collective.recipe.environment
#----------------
#----------------
#--
#--
#-- Connection informations to re-use.
#-- Connection informations to re-use.
...
@@ -271,5 +268,5 @@ recipe = collective.recipe.environment
...
@@ -271,5 +268,5 @@ recipe = collective.recipe.environment
[resilient-publish-connection-parameter]
[resilient-publish-connection-parameter]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
ssh-public-key = $${sshkeys-sshd:public-key-value}
ssh-public-key = $${sshkeys-sshd:public-key-value}
ssh-url = ssh://$${
environment:USER
}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ssh-url = ssh://$${
slap-configuration:slapuser
}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
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