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
Labels
Merge Requests
93
Merge Requests
93
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
c696c0af
Commit
c696c0af
authored
Mar 07, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[runner] fix parts for webrunner resilient
share parts with instance-runner.cfg
parent
83635f59
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
46 deletions
+7
-46
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+2
-2
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+3
-43
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-1
No files found.
software/slaprunner/buildout.hash.cfg
View file @
c696c0af
...
...
@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
[template-runner]
filename = instance-runner.cfg
md5sum =
a897ae4e90696516c4a6f831999f2c34
md5sum =
7c48c89f33ad243f0dffb3eeef8c56e8
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
...
...
@@ -30,7 +30,7 @@ md5sum = 1ed9526a6e5ac9a80e5b3add2d0a88fe
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum =
7f87e6d220934eb13ab2b5d67dca8922
md5sum =
4b19026c50af55c8b7387aeaf624b47c
[template-resilient]
filename = instance-resilient.cfg.jinja2
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
c696c0af
...
...
@@ -2,49 +2,9 @@
extends = {{ template_runner_path }}
{{ pbsready_export_template_path }}
parts +=
nginx_conf
nginx-launcher
certificate-authority
ca-nginx
certificate-authority-service
ca-nginx-service
logrotate-entry-nginx
gunicorn-launcher
gunicorn-graceful
publish-connection-information
slaprunner-promise
apache-httpd-promise
logrotate-entry-apache-httpd
slaprunner-supervisord-wrapper
runner-sshd-add-authorized-key
runner-sshd-graceful
runner-sshd-promise
runner-sshkeys-authority
runner-sshkeys-authority-service
runner-sshkeys-sshd
runner-sshkeys-sshd-service
runtestsuite
symlinks
shellinabox
shellinabox-service
slapos-cfg
cron-entry-prepare-software
deploy-instance-parameters
instance-software
instance-software-type
minishell-cwd
bash-profile
supervisord-wrapper
supervisord-promise
logrotate-entry-supervisord
logrotate-entry-slapgrid
httpd-graceful-wrapper
## Monitoring part
## Monitor for runner
monitor-base
monitor-check-resilient-feed-file
monitor-check-webrunner-internal-instance
# parts from {{ template_runner_path }} are overriden by
# {{ pbsready_export_template_path }} so we reinclude them here
parts += ${:common-runner-parts}
[directory]
recipe = slapos.cookbook:mkdirectory
...
...
software/slaprunner/instance-runner.cfg
View file @
c696c0af
[buildout]
parts =
common-runner-
parts =
nginx_conf
nginx-launcher
certificate-authority
...
...
@@ -50,6 +50,7 @@ parts =
## Usability part
template-slapuser-script
parts = $${:common-runner-parts}
extends = ${monitor2-template:rendered}
eggs-directory = ${buildout:eggs-directory}
...
...
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