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
Leo Le Bouter
slapos
Commits
30702054
Commit
30702054
authored
Jul 25, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: add https to resiliency
parent
5314b10e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
16 deletions
+44
-16
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+2
-1
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+23
-9
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+19
-6
No files found.
software/slaprunner/instance-resilient.cfg.jinja2
View file @
30702054
...
@@ -17,7 +17,7 @@ parts +=
...
@@ -17,7 +17,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 cloud9_url ssh_command password_recovery_code
return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code
cloud9_backend_url
config = instance-amount debug domain number authorized-key notify ip-list namebase runner1-computer-guid pbs-runner1-computer-guid runner2-computer-guid pbs-runner2-computer-guid runner3-computer-guid pbs-runner3-computer-guid
config = instance-amount debug domain number authorized-key notify ip-list namebase runner1-computer-guid pbs-runner1-computer-guid runner2-computer-guid pbs-runner2-computer-guid runner3-computer-guid pbs-runner3-computer-guid
# XXX Cedric LN Ugly hack, resilient stack and slaprunner stack sharing too much ssh sections
# XXX Cedric LN Ugly hack, resilient stack and slaprunner stack sharing too much ssh sections
config-authorized-key = ${request-pbs-runner-1:connection-ssh-key} ${request-pbs-runner-2:connection-ssh-key} ${slap-parameter:authorized-key}
config-authorized-key = ${request-pbs-runner-1:connection-ssh-key} ${request-pbs-runner-2:connection-ssh-key} ${slap-parameter:authorized-key}
...
@@ -38,6 +38,7 @@ recipe = slapos.cookbook:publish
...
@@ -38,6 +38,7 @@ recipe = slapos.cookbook:publish
backend_url = ${request-runner:connection-backend_url}
backend_url = ${request-runner:connection-backend_url}
url = ${request-runner:connection-url}
url = ${request-runner:connection-url}
cloud9_url = ${request-runner:connection-cloud9_url}
cloud9_url = ${request-runner:connection-cloud9_url}
cloud9_backend_url = ${request-runner:connection-cloud9_backend_url}
ssh_command = ${request-runner:connection-ssh_command}
ssh_command = ${request-runner:connection-ssh_command}
password_recovery_code = ${request-runner:connection-password_recovery_code}
password_recovery_code = ${request-runner:connection-password_recovery_code}
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
30702054
...
@@ -3,12 +3,25 @@ extends = ${template-runner:output}
...
@@ -3,12 +3,25 @@ extends = ${template-runner:output}
${pbsready-export:output}
${pbsready-export:output}
parts +=
parts +=
urls
certificate-authority
ca-nginx
nginx_conf
nginx_conf
nginx-launcher
nginx-launcher
cloud9
certificate-authority
ca-nginx
ca-node-frontend
slaprunner
slaprunner
test-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
sshkeys-authority
slaprunner-promise
slaprunner-frontend-promise
cloud9-promise
dropbear-promise
symlinks
node-frontend-promise
nginx-promise
urls
cron-entry-backup
cron-entry-backup
[exporter]
[exporter]
...
@@ -25,7 +38,8 @@ rsync-binary = ${rsync:location}/bin/rsync
...
@@ -25,7 +38,8 @@ rsync-binary = ${rsync:location}/bin/rsync
[urls]
[urls]
<= resilient-publish-connection-parameter
<= resilient-publish-connection-parameter
backend_url = $${slaprunner:access-url}
backend_url = $${slaprunner:access-url}
url = $${request-frontend:connection-site_url}
url = https://$${request-frontend:connection-domain}
cloud9_url = https://[$${nginx-frontend:ip}]:$${nginx-frontend:port}
cloud9_backend_url = $${node-frontend:access-url}
cloud9_url = https://$${request-cloud9-frontend:connection-domain}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
password_recovery_code = $${recovery-code:passwd}
password_recovery_code = $${recovery-code:passwd}
software/slaprunner/instance-runner-import.cfg.in
View file @
30702054
...
@@ -3,11 +3,24 @@ extends = ${template-runner:output}
...
@@ -3,11 +3,24 @@ extends = ${template-runner:output}
${pbsready-import:output}
${pbsready-import:output}
parts +=
parts +=
certificate-authority
ca-nginx
nginx_conf
nginx_conf
nginx-launcher
nginx-launcher
cloud9
certificate-authority
ca-nginx
ca-node-frontend
slaprunner
slaprunner
test-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
sshkeys-authority
slaprunner-promise
cloud9-promise
dropbear-promise
symlinks
nginx-promise
urls
cron-entry-backup
# have to repeat the next one, as it's not inherited from pbsready-import
# have to repeat the next one, as it's not inherited from pbsready-import
import-on-notification
import-on-notification
...
...
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