Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
70
Merge Requests
70
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
e9f3b2c5
Commit
e9f3b2c5
authored
Sep 16, 2016
by
Nicolas Wavrant
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resilient & slaprunner: get username from userinfo recipe instead of slapconfiguration
parent
73d73b52
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
common.cfg
software/slaprunner/common.cfg
+1
-1
instance-runner.cfg
software/slaprunner/instance-runner.cfg
+4
-1
buildout.cfg
stack/resilient/buildout.cfg
+1
-1
pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+5
-1
No files found.
software/slaprunner/common.cfg
View file @
e9f3b2c5
...
...
@@ -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 =
8833cc43e6ce808b646bd92f67e57d53
md5sum =
26a58e69c4c59d30c9e2f50075cdc679
mode = 0644
[template-runner-import-script]
...
...
software/slaprunner/instance-runner.cfg
View file @
e9f3b2c5
...
...
@@ -530,12 +530,15 @@ password = $${htpasswd:passwd}
#--
#-- Send information to SlapOS Master
[user-info]
recipe = slapos.cookbook:userinfo
[publish-connection-information]
recipe = slapos.cookbook:publish
backend-url = $${slaprunner:access-url}
init-user = $${runner-htpasswd:user}
init-password = $${runner-htpasswd:password}
ssh-command = ssh $${
slap-configuration:slapuser
}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
ssh-command = ssh $${
user-info:pw-name
}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
monitor-base-url = $${publish:monitor-base-url}
...
...
stack/resilient/buildout.cfg
View file @
e9f3b2c5
...
...
@@ -41,7 +41,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum =
9deb4e6ee2779d228a01599cdd424724
md5sum =
fee06ab268015b394ec49cb4600de1ed
mode = 0644
[pbsready-import]
...
...
stack/resilient/pbsready.cfg.in
View file @
e9f3b2c5
...
...
@@ -263,9 +263,13 @@ mode = 700
#----------------
#--
#-- Connection informations to re-use.
[user-info]
recipe = slapos.cookbook:userinfo
# XXX-Cedric: when "aggregation" system is done in libslap, directly publish.
[resilient-publish-connection-parameter]
recipe = slapos.cookbook:publish
ssh-public-key = $${sshkeys-sshd:public-key-value}
ssh-url = ssh://$${
slap-configuration:slapuser
}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ssh-url = ssh://$${
user-info:pw-name
}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
Nicolas Wavrant
@Nicolas
mentioned in commit
fd5f808b
·
Sep 16, 2016
mentioned in commit
fd5f808b
mentioned in commit fd5f808b9eccb1ff5fdd502bac9b57d8743ecd67
Toggle commit list
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