Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
123c7e2a
Commit
123c7e2a
authored
Sep 12, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slupranner: gets user from slap-configuration instead of environment
parent
fd5f808b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
No files found.
software/slaprunner/common.cfg
View file @
123c7e2a
...
@@ -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 =
f82470af9aaace356579d1a182a9c65b
md5sum =
b3f284ef5b3c60bf4b6a90d4b3116d4c
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
...
software/slaprunner/instance-runner.cfg
View file @
123c7e2a
...
@@ -534,7 +534,7 @@ recipe = slapos.cookbook:publish
...
@@ -534,7 +534,7 @@ recipe = slapos.cookbook:publish
backend-url = $${slaprunner:access-url}
backend-url = $${slaprunner:access-url}
init-user = $${runner-htpasswd:user}
init-user = $${runner-htpasswd:user}
init-password = $${runner-htpasswd:password}
init-password = $${runner-htpasswd:password}
ssh-command = ssh $${
environ:USER
}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
ssh-command = ssh $${
slap-configuration:slapuser
}@$${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-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/
git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
monitor-base-url = $${publish:monitor-base-url}
monitor-base-url = $${publish:monitor-base-url}
...
...
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