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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
0c519a52
Commit
0c519a52
authored
Dec 13, 2018
by
Nicolas Wavrant
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: correctly order the extends
parent
51e50fad
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+3
-3
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+2
-2
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+3
-3
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
No files found.
software/slaprunner/buildout.hash.cfg
View file @
0c519a52
...
...
@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
[template-runner]
filename = instance-runner.cfg
md5sum =
d9096d49eda70f3aa02c44615077f6c9
md5sum =
7677eb32c3b77fac5019dd0e864084d6
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
...
...
@@ -26,11 +26,11 @@ md5sum = ed2e08c07a6727b2012f15da67c0705d
[instance-runner-import]
filename = instance-runner-import.cfg.in
md5sum =
1ed9526a6e5ac9a80e5b3add2d0a88fe
md5sum =
7a703358481fc1912019bb9deabd2410
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum =
8132130c89896c2d30a08f3b3a7000ff
md5sum =
90bee22f126bb9d0bcf68c1b15751b08
[template-resilient]
filename = instance-resilient.cfg.jinja2
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
0c519a52
[buildout]
extends = {{
template_runner
_path }}
{{
pbsready_export_template
_path }}
extends = {{
pbsready_export_template
_path }}
{{
template_runner
_path }}
parts +=
nginx_conf
...
...
software/slaprunner/instance-runner-import.cfg.in
View file @
0c519a52
[buildout]
extends = {{
template_runner
_path }}
{{
pbsready_import_template
_path }}
extends = {{
pbsready_import_template
_path }}
{{
template_runner
_path }}
parts +=
nginx_conf
...
...
@@ -35,7 +35,7 @@ parts +=
resilient-software-release-information
# have to repeat the next one, as it's not inherited from pbsready-import
import-on-notification
#
import-on-notification
Nicolas Wavrant
@Nicolas
·
Dec 13, 2018
Maintainer
I'll clean that
I'll clean that
Please
register
or
sign in
to reply
monitor-base
...
...
software/slaprunner/instance-runner.cfg
View file @
0c519a52
[buildout]
parts =
parts
+
=
nginx_conf
nginx-launcher
certificate-authority
...
...
Nicolas Wavrant
@Nicolas
mentioned in commit
nexedi/slapos@8a7bf8bb
·
Dec 13, 2018
mentioned in commit
nexedi/slapos@8a7bf8bb
mentioned in commit nexedi/slapos@8a7bf8bb85d73beb322f4027d0fa02efd180672c
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