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
Léo-Paul Géneau
slapos
Commits
9b2c9835
Commit
9b2c9835
authored
Dec 01, 2021
by
Julien Muchembled
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some useless 'mode' options when downloading and generating from templates
parent
20f59e7a
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
6 additions
and
29 deletions
+6
-29
component/apache/buildout.cfg
component/apache/buildout.cfg
+0
-1
component/bazel/buildout.cfg
component/bazel/buildout.cfg
+0
-2
component/fontconfig/buildout.cfg
component/fontconfig/buildout.cfg
+0
-1
component/golang/buildout.cfg
component/golang/buildout.cfg
+0
-1
component/jupyter-py2/buildout.cfg
component/jupyter-py2/buildout.cfg
+0
-2
component/jupyter-py2/buildout.hash.cfg
component/jupyter-py2/buildout.hash.cfg
+1
-1
component/jupyter-py2/instance.cfg.in
component/jupyter-py2/instance.cfg.in
+2
-7
component/libatlas/buildout.cfg
component/libatlas/buildout.cfg
+0
-1
component/matplotlib/buildout.cfg
component/matplotlib/buildout.cfg
+0
-1
component/perl/buildout.cfg
component/perl/buildout.cfg
+0
-1
software/jupyter/buildout.hash.cfg
software/jupyter/buildout.hash.cfg
+1
-1
software/jupyter/instance-jupyter.cfg.in
software/jupyter/instance-jupyter.cfg.in
+2
-7
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+0
-3
No files found.
component/apache/buildout.cfg
View file @
9b2c9835
...
@@ -125,4 +125,3 @@ environment =
...
@@ -125,4 +125,3 @@ environment =
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
shared = true
shared = true
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
mode = 640
component/bazel/buildout.cfg
View file @
9b2c9835
...
@@ -18,7 +18,6 @@ strip-top-level-dir = true
...
@@ -18,7 +18,6 @@ strip-top-level-dir = true
[template-bazel-crosstool]
[template-bazel-crosstool]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 640
filename = bazel_tools_cpp_CROSSTOOL
filename = bazel_tools_cpp_CROSSTOOL
template = ${:_profile_base_location_}/${:filename}.in
template = ${:_profile_base_location_}/${:filename}.in
rendered = ${:location}/${:filename}
rendered = ${:location}/${:filename}
...
@@ -29,7 +28,6 @@ context =
...
@@ -29,7 +28,6 @@ context =
[template-bazel-src-main-cpp-build]
[template-bazel-src-main-cpp-build]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 640
filename = bazel_src_main_cpp_BUILD
filename = bazel_src_main_cpp_BUILD
template = ${:_profile_base_location_}/${:filename}.in
template = ${:_profile_base_location_}/${:filename}.in
rendered = ${:location}/${:filename}
rendered = ${:location}/${:filename}
...
...
component/fontconfig/buildout.cfg
View file @
9b2c9835
...
@@ -33,4 +33,3 @@ environment =
...
@@ -33,4 +33,3 @@ environment =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:parts-directory}/${:_buildout_section_name_}
output = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 640
component/golang/buildout.cfg
View file @
9b2c9835
...
@@ -109,7 +109,6 @@ environment-extra =
...
@@ -109,7 +109,6 @@ environment-extra =
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
exe = ${buildout:bin-directory}/go
exe = ${buildout:bin-directory}/go
rendered= ${:exe}
rendered= ${:exe}
mode = 755
template= inline:
template= inline:
#!/bin/sh -e
#!/bin/sh -e
. ${gowork:env.sh}
. ${gowork:env.sh}
...
...
component/jupyter-py2/buildout.cfg
View file @
9b2c9835
...
@@ -23,7 +23,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
...
@@ -23,7 +23,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
download-only = true
download-only = true
mode = 0644
[jupyter-notebook-config]
[jupyter-notebook-config]
<= download-file-base
<= download-file-base
...
@@ -44,7 +43,6 @@ mode = 0644
...
@@ -44,7 +43,6 @@ mode = 0644
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}
template = ${:_profile_base_location_}/${:filename}
rendered = ${buildout:directory}/template.cfg
rendered = ${buildout:directory}/template.cfg
mode = 0644
context =
context =
key bin_directory buildout:bin-directory
key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
...
...
component/jupyter-py2/buildout.hash.cfg
View file @
9b2c9835
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-jupyter-notebook]
[instance-jupyter-notebook]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
1d5fe6cc4e48672ae7be1c223794a93
2
md5sum =
357f28614a13cdbf00a29a83cbfd264
2
[jupyter-notebook-config]
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
filename = jupyter_notebook_config.py.jinja
...
...
component/jupyter-py2/instance.cfg.in
View file @
9b2c9835
...
@@ -37,10 +37,6 @@ key_file = ${generate-certificate:key_file}
...
@@ -37,10 +37,6 @@ key_file = ${generate-certificate:key_file}
logfile = ${directory:log}/jupyter_notebook.log
logfile = ${directory:log}/jupyter_notebook.log
notebook_dir = ${directory:notebook_dir}
notebook_dir = ${directory:notebook_dir}
[dynamic-jinja2-template-base]
recipe = slapos.recipe.template:jinja2
mode = 0644
[generate-certificate]
[generate-certificate]
; TODO: there is a slapos recipe to generate certificates. Use it instead
; TODO: there is a slapos recipe to generate certificates. Use it instead
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -76,10 +72,9 @@ environment =
...
@@ -76,10 +72,9 @@ environment =
LANG=C.UTF-8
LANG=C.UTF-8
[jupyter-notebook-config]
[jupyter-notebook-config]
<= dynamic-jinja2-template-base
recipe = slapos.recipe.template:jinja2
template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
mode = 0744
context =
context =
raw config_cfg ${buildout:directory}/knowledge0.cfg
raw config_cfg ${buildout:directory}/knowledge0.cfg
...
@@ -134,7 +129,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
...
@@ -134,7 +129,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
target-directory = ${directory:erp5_kernel_dir}
target-directory = ${directory:erp5_kernel_dir}
[kernel-json]
[kernel-json]
<= dynamic-jinja2-template-base
recipe = slapos.recipe.template:jinja2
template = {{ kernel_json_location }}/{{ kernel_json_filename }}
template = {{ kernel_json_location }}/{{ kernel_json_filename }}
rendered = ${directory:erp5_kernel_dir}/kernel.json
rendered = ${directory:erp5_kernel_dir}/kernel.json
# Use python2.7 executable bin file for kernel config
# Use python2.7 executable bin file for kernel config
...
...
component/libatlas/buildout.cfg
View file @
9b2c9835
...
@@ -13,7 +13,6 @@ filename = lapack-${:version}.tgz
...
@@ -13,7 +13,6 @@ filename = lapack-${:version}.tgz
url = http://www.netlib.org/lapack/${:filename}
url = http://www.netlib.org/lapack/${:filename}
md5sum = b1d3e3e425b2e44a06760ff173104bdf
md5sum = b1d3e3e425b2e44a06760ff173104bdf
download-only = true
download-only = true
mode = 0644
[libatlas]
[libatlas]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
...
component/matplotlib/buildout.cfg
View file @
9b2c9835
...
@@ -14,7 +14,6 @@ recipe = slapos.recipe.template:jinja2
...
@@ -14,7 +14,6 @@ recipe = slapos.recipe.template:jinja2
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
template = ${:_profile_base_location_}/${:filename}
template = ${:_profile_base_location_}/${:filename}
rendered = ${matplotlibrc:location}/matplotlibrc
rendered = ${matplotlibrc:location}/matplotlibrc
mode = 0644
backend = agg
backend = agg
context =
context =
key backend matplotlibrc:backend
key backend matplotlibrc:backend
...
...
component/perl/buildout.cfg
View file @
9b2c9835
...
@@ -124,6 +124,5 @@ template = inline:
...
@@ -124,6 +124,5 @@ template = inline:
exec ${perl:location}/bin/perl \
exec ${perl:location}/bin/perl \
{% for item in inc -%}{% if item %} -I "{{ item }}" \
{% for item in inc -%}{% if item %} -I "{{ item }}" \
{% endif %}{% endfor %} "$@"
{% endif %}{% endfor %} "$@"
mode = 0755
rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
perl-bin = ${:rendered}
perl-bin = ${:rendered}
software/jupyter/buildout.hash.cfg
View file @
9b2c9835
...
@@ -19,7 +19,7 @@ md5sum = de37ec3d4adb0be4c67bcc7397f27c91
...
@@ -19,7 +19,7 @@ md5sum = de37ec3d4adb0be4c67bcc7397f27c91
[instance-jupyter]
[instance-jupyter]
filename = instance-jupyter.cfg.in
filename = instance-jupyter.cfg.in
md5sum =
95e3da48abdd257fb9d5dbdf14ea87b9
md5sum =
1136bb108aa8d703e0ecf2005b4a1f28
[jupyter-notebook-config]
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
filename = jupyter_notebook_config.py.jinja
...
...
software/jupyter/instance-jupyter.cfg.in
View file @
9b2c9835
...
@@ -55,10 +55,6 @@ frontend-additional-instance-name = Jupyter Frontend Additional
...
@@ -55,10 +55,6 @@ frontend-additional-instance-name = Jupyter Frontend Additional
{{ k }} = {{ v }}
{{ k }} = {{ v }}
{% endfor -%}
{% endfor -%}
[dynamic-jinja2-template-base]
recipe = slapos.recipe.template:jinja2
mode = 0644
[generate-certificate]
[generate-certificate]
; TODO: there is a slapos recipe to generate certificates. Use it instead
; TODO: there is a slapos recipe to generate certificates. Use it instead
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -98,10 +94,9 @@ recipe = slapos.cookbook:generate.password
...
@@ -98,10 +94,9 @@ recipe = slapos.cookbook:generate.password
bytes = 10
bytes = 10
[jupyter-notebook-config]
[jupyter-notebook-config]
<= dynamic-jinja2-template-base
recipe = slapos.recipe.template:jinja2
template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
mode = 0744
context =
context =
key password jupyter-password:passwd
key password jupyter-password:passwd
raw gcc_location {{ gcc_location }}
raw gcc_location {{ gcc_location }}
...
@@ -192,7 +187,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
...
@@ -192,7 +187,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
target-directory = ${directory:erp5_kernel_dir}
target-directory = ${directory:erp5_kernel_dir}
[kernel-json]
[kernel-json]
<= dynamic-jinja2-template-base
recipe = slapos.recipe.template:jinja2
template = {{ kernel_json_location }}/{{ kernel_json_filename }}
template = {{ kernel_json_location }}/{{ kernel_json_filename }}
rendered = ${directory:erp5_kernel_dir}/kernel.json
rendered = ${directory:erp5_kernel_dir}/kernel.json
# Use python2.7 executable bin file for kernel config
# Use python2.7 executable bin file for kernel config
...
...
stack/erp5/buildout.cfg
View file @
9b2c9835
...
@@ -98,15 +98,12 @@ url = ${:_profile_base_location_}/${:filename}
...
@@ -98,15 +98,12 @@ url = ${:_profile_base_location_}/${:filename}
[mariadb-start-clone-from-backup]
[mariadb-start-clone-from-backup]
<= download-base
<= download-base
mode = 755
[mariadb-resiliency-after-import-script]
[mariadb-resiliency-after-import-script]
<= download-base
<= download-base
mode = 755
[mariadb-slow-query-report-script]
[mariadb-slow-query-report-script]
<= download-base
<= download-base
mode = 755
[template-mariadb]
[template-mariadb]
<= download-base
<= download-base
...
...
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