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
105
Merge Requests
105
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
e7083872
Commit
e7083872
authored
Jun 24, 2013
by
Vincent Pelletier
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow naming convention.
parent
9619a3cf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/wrapper.py
slapos/recipe/wrapper.py
+1
-1
software/jio/instance.cfg.in
software/jio/instance.cfg.in
+1
-1
No files found.
slapos/recipe/wrapper.py
View file @
e7083872
...
@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
wrapper_path
=
self
.
options
[
'wrapper-path'
]
wrapper_path
=
self
.
options
[
'wrapper-path'
]
wait_files
=
self
.
options
.
get
(
'wait-for-files'
)
wait_files
=
self
.
options
.
get
(
'wait-for-files'
)
environment
=
self
.
options
.
get
(
'environment'
)
environment
=
self
.
options
.
get
(
'environment'
)
parameters_extra
=
self
.
options
.
get
(
'parameters
_
extra'
)
parameters_extra
=
self
.
options
.
get
(
'parameters
-
extra'
)
if
not
wait_files
and
not
environment
:
if
not
wait_files
and
not
environment
:
# Create a simple wrapper as shell script
# Create a simple wrapper as shell script
...
...
software/jio/instance.cfg.in
View file @
e7083872
...
@@ -46,4 +46,4 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
...
@@ -46,4 +46,4 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/phantomjs-slapos
command-line = ${phantomjs:location}/phantomjs-slapos
wrapper-path = $${directory:bin}/phantomjs
wrapper-path = $${directory:bin}/phantomjs
parameters
_
extra = true
parameters
-
extra = true
Jérome Perrin
@jerome
mentioned in commit
5f5d5102
·
Jul 19, 2016
mentioned in commit
5f5d5102
mentioned in commit 5f5d5102cf2dd2b4a8d092e32dfc6b87fa3bbc12
Toggle commit list
Jérome Perrin
@jerome
mentioned in commit
6082d6e9
·
Jul 19, 2016
mentioned in commit
6082d6e9
mentioned in commit 6082d6e9b2d0f397d0712d40370e8c4f94572cef
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