Skip to content

M
moodle_rebase10.1.2
Commit 1dd26524 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

Merge branch 'master' into erp5-component

parents 040129b7 3fcd2fcd
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
software/jio/instance.cfg.in
View file @ 1dd26524
...@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio ...@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
[phantomjs-wrapper] [phantomjs-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/bin/phantomjs command-line = ${phantomjs:location}/phantomjs-slapos
wrapper-path = $${directory:bin}/phantomjs wrapper-path = $${directory:bin}/phantomjs
parameters_extra = true parameters_extra = true
software/jio/software.cfg
View file @ 1dd26524
...@@ -43,7 +43,7 @@ recipe = slapos.recipe.template ...@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development, but must be filled for production # MD5 checksum can be skipped for development, but must be filled for production
md5sum = 1ef1bc6a3fb81300ce7139c512af96d7 md5sum = 94421503ca09f77ee1e94e4b1ef4e6a7
mode = 0644 mode = 0644
[jio-repository] [jio-repository]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7