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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
9955cbe4
Commit
9955cbe4
authored
Aug 29, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: return of git-public/git-private url parameters
parent
5edf72a0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+3
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-1
No files found.
software/slaprunner/common.cfg
View file @
9955cbe4
...
@@ -43,7 +43,7 @@ mode = 0644
...
@@ -43,7 +43,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 =
e24429a12dc5e733f5597227adea3b10
md5sum =
9b07a5e3409fe44f2ce23b5bdc6b8d6c
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -79,7 +79,7 @@ mode = 0644
...
@@ -79,7 +79,7 @@ mode = 0644
[template-resilient]
[template-resilient]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
md5sum =
dae3a29317454443a1ab733830363b0e
md5sum =
aec7fb7fe57b48c5c26c7adcdff36d26
filename = instance-resilient.cfg.jinja2
filename = instance-resilient.cfg.jinja2
mode = 0644
mode = 0644
...
...
software/slaprunner/instance-resilient.cfg.jinja2
View file @
9955cbe4
...
@@ -28,7 +28,7 @@ parts +=
...
@@ -28,7 +28,7 @@ parts +=
# Bubble up the parameters
# Bubble up the parameters
[request-runner]
[request-runner]
return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url git_url
return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url git_
public_url git_private_
url
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
@@ -41,7 +41,8 @@ ssh_command = ${request-runner:connection-ssh_command}
...
@@ -41,7 +41,8 @@ ssh_command = ${request-runner:connection-ssh_command}
monitor_url = ${request-runner:connection-monitor_url}
monitor_url = ${request-runner:connection-monitor_url}
webdav_url = ${request-runner:connection-webdav_url}
webdav_url = ${request-runner:connection-webdav_url}
public_url = ${request-runner:connection-public_url}
public_url = ${request-runner:connection-public_url}
git_url = ${request-runner:connection-git_url}
git_public_url = ${request-runner:connection-git_public_url}
git_private_url = ${request-runner:connection-git_private_url}
[slap-parameter]
[slap-parameter]
# Default parameters for distributed deployment
# Default parameters for distributed deployment
...
...
software/slaprunner/instance-runner.cfg
View file @
9955cbe4
...
@@ -448,7 +448,8 @@ ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:p
...
@@ -448,7 +448,8 @@ ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:p
monitor_url = https://$${monitor-frontend:connection-domain}
monitor_url = https://$${monitor-frontend:connection-domain}
webdav_url = $${:monitor_url}/share/
webdav_url = $${:monitor_url}/share/
public_url = $${:monitor_url}/public/
public_url = $${:monitor_url}/public/
git_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git/
git_public_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git-public/
git_private_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git/
#---------------------------
#---------------------------
#--
#--
...
...
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