Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
moodle_rebase10.1.2
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
Dmitry Blinov
moodle_rebase10.1.2
Commits
a7a36453
Commit
a7a36453
authored
Mar 20, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up some zc.recipe.egg sections installing the same scripts/interpreter
parent
ffbb80d4
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
22 additions
and
72 deletions
+22
-72
component/jupyter/buildout.cfg
component/jupyter/buildout.cfg
+0
-1
software/backupserver/software.cfg
software/backupserver/software.cfg
+0
-6
software/html5ide/software.cfg
software/html5ide/software.cfg
+0
-1
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+1
-1
software/kvm/software.cfg
software/kvm/software.cfg
+2
-13
software/monitor/software.cfg
software/monitor/software.cfg
+2
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+0
-13
software/neotest/software.cfg
software/neotest/software.cfg
+0
-1
software/powerdns/software.cfg
software/powerdns/software.cfg
+0
-1
software/slaprunner/software-py3.cfg
software/slaprunner/software-py3.cfg
+1
-1
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+3
-15
stack/caucase/buildout.cfg
stack/caucase/buildout.cfg
+1
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+10
-11
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+1
-7
No files found.
component/jupyter/buildout.cfg
View file @
a7a36453
...
@@ -70,7 +70,6 @@ scripts =
...
@@ -70,7 +70,6 @@ scripts =
[jupyter-notebook-initialized-scripts]
[jupyter-notebook-initialized-scripts]
recipe = zc.recipe.egg:scripts
recipe = zc.recipe.egg:scripts
eggs = ${jupyter:eggs}
eggs = ${jupyter:eggs}
interpreter = pythonjupyter
environment = jupyter-env
environment = jupyter-env
scripts =
scripts =
...
...
software/backupserver/software.cfg
View file @
a7a36453
...
@@ -17,7 +17,6 @@ extends =
...
@@ -17,7 +17,6 @@ extends =
parts =
parts =
extra-eggs
extra-eggs
monitor-extra-eggs
rdiff-backup
rdiff-backup
dcron
dcron
logrotate
logrotate
...
@@ -30,11 +29,6 @@ parts =
...
@@ -30,11 +29,6 @@ parts =
template-crontab-line
template-crontab-line
slapos-cookbook
slapos-cookbook
[monitor-extra-eggs]
recipe = zc.recipe.egg
eggs =
${monitor-eggs:eggs}
[extra-eggs]
[extra-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
interpreter = pythonforrssgen
interpreter = pythonforrssgen
...
...
software/html5ide/software.cfg
View file @
a7a36453
...
@@ -8,7 +8,6 @@ extends =
...
@@ -8,7 +8,6 @@ extends =
../../component/nodejs/buildout.cfg
../../component/nodejs/buildout.cfg
parts =
parts =
monitor-eggs
slapos-cookbook
slapos-cookbook
nodejs
nodejs
template
template
...
...
software/kvm/buildout.hash.cfg
View file @
a7a36453
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum = c
9d4356b5148ed8ff8c4f3da63c137ce
md5sum = c
ad7d490b84a484b089e34b27a5675ff
[template-kvm]
[template-kvm]
filename = instance-kvm.cfg.jinja2
filename = instance-kvm.cfg.jinja2
...
...
software/kvm/instance.cfg.in
View file @
a7a36453
...
@@ -87,7 +87,7 @@ extra-context =
...
@@ -87,7 +87,7 @@ extra-context =
raw novnc_location ${noVNC:location}
raw novnc_location ${noVNC:location}
raw netcat_bin ${netcat:location}/bin/netcat
raw netcat_bin ${netcat:location}/bin/netcat
raw python_executable ${buildout:executable}
raw python_executable ${buildout:executable}
raw python_eggs_executable ${buildout:bin-directory}/${eggs:interpreter}
raw python_eggs_executable ${buildout:bin-directory}/${e
xtra-e
ggs:interpreter}
raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
...
...
software/kvm/software.cfg
View file @
a7a36453
...
@@ -19,7 +19,6 @@ extends =
...
@@ -19,7 +19,6 @@ extends =
# to avoid versioning issues
# to avoid versioning issues
common-parts =
common-parts =
template
template
eggs
# XXX: we have to manually add this for resilience
# XXX: we have to manually add this for resilience
rdiff-backup
rdiff-backup
...
@@ -41,22 +40,12 @@ parts = ${:common-parts}
...
@@ -41,22 +40,12 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[eggs]
[extra-eggs]
recipe = zc.recipe.egg
eggs +=
interpreter = python.eggs
eggs =
${python-cffi:egg}
${python-cffi:egg}
${python-cryptography:egg}
${lxml-python:egg}
websockify
websockify
slapos.cookbook
slapos.cookbook
slapos.toolbox
erp5.util
erp5.util
cns.recipe.symlink
collective.recipe.template
plone.recipe.command
${pycurl:egg}
collective.recipe.shelloutput
[http-proxy]
[http-proxy]
# https://github.com/nodejitsu/node-http-proxy
# https://github.com/nodejitsu/node-http-proxy
...
...
software/monitor/software.cfg
View file @
a7a36453
...
@@ -84,11 +84,13 @@ scripts =
...
@@ -84,11 +84,13 @@ scripts =
surykatka
surykatka
[monitor-eggs]
[monitor-eggs]
recipe = zc.recipe.egg
eggs +=
eggs +=
slapos.cookbook
slapos.cookbook
slapos.recipe.cmmi
slapos.recipe.cmmi
hexagonit.recipe.download
hexagonit.recipe.download
plone.recipe.command
plone.recipe.command
scripts =
[versions]
[versions]
slapos.recipe.template = 4.4
slapos.recipe.template = 4.4
...
...
software/neoppod/software-common.cfg
View file @
a7a36453
...
@@ -25,7 +25,6 @@ parts =
...
@@ -25,7 +25,6 @@ parts =
# before any other section that would depend on it
# before any other section that would depend on it
neoppod-develop
neoppod-develop
neoppod
neoppod
slapos-deps-eggs
slapos-cookbook
slapos-cookbook
[neoppod-repository]
[neoppod-repository]
...
@@ -72,18 +71,6 @@ egg = ${:_buildout_section_name_}
...
@@ -72,18 +71,6 @@ egg = ${:_buildout_section_name_}
setup-eggs = ${python-cffi:egg}
setup-eggs = ${python-cffi:egg}
###
###
[slapos-deps-eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${pycurl:egg}
${python-PyYAML:egg}
${python-cryptography:egg}
${python-cliff:egg}
slapos.toolbox
scripts =
slapos-kill
[download-base-neo]
[download-base-neo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
...
...
software/neotest/software.cfg
View file @
a7a36453
...
@@ -39,7 +39,6 @@ parts =
...
@@ -39,7 +39,6 @@ parts =
neotest-runTestSuite
neotest-runTestSuite
# for instance
# for instance
slapos-deps-eggs
slapos-cookbook
slapos-cookbook
instance.cfg
instance.cfg
...
...
software/powerdns/software.cfg
View file @
a7a36453
...
@@ -8,7 +8,6 @@ extends =
...
@@ -8,7 +8,6 @@ extends =
parts =
parts =
template
template
slapos-cookbook
slapos-cookbook
monitor-eggs
eggs
eggs
[eggs]
[eggs]
...
...
software/slaprunner/software-py3.cfg
View file @
a7a36453
...
@@ -9,7 +9,7 @@ python = python3
...
@@ -9,7 +9,7 @@ python = python3
common-parts -=
common-parts -=
rdiff-backup
rdiff-backup
[eggs]
[e
xtra-e
ggs]
eggs -=
eggs -=
# futures is a backport of Py3's concurrent.futures module
# futures is a backport of Py3's concurrent.futures module
futures
futures
software/slaprunner/software.cfg
View file @
a7a36453
...
@@ -37,8 +37,8 @@ shared-part-list =
...
@@ -37,8 +37,8 @@ shared-part-list =
# to avoid versioning issues
# to avoid versioning issues
common-parts =
common-parts =
slapos-cookbook
template
template
eggs
instance-runner-import
instance-runner-import
instance-runner-export
instance-runner-export
template-slapos-cfg
template-slapos-cfg
...
@@ -141,27 +141,15 @@ filename = slapos-slapuser-script.in
...
@@ -141,27 +141,15 @@ filename = slapos-slapuser-script.in
< = template-base
< = template-base
output = ${buildout:directory}/buildout-shared-part-list
output = ${buildout:directory}/buildout-shared-part-list
[eggs]
[extra-eggs]
recipe = zc.recipe.egg
eggs +=
eggs =
${pycurl:egg}
collective.recipe.template
cns.recipe.symlink
erp5.util
erp5.util
lock-file
lock-file
plone.recipe.command
slapos.recipe.build
slapos.recipe.build
slapos.toolbox[flask_auth]
slapos.toolbox[flask_auth]
gunicorn
gunicorn
# for gunicorn[gthread]
# for gunicorn[gthread]
futures
futures
${slapos-cookbook:eggs}
slapos.core # listed explicitly for scripts generation
[extra-eggs]
recipe = zc.recipe.egg
interpreter = pythonwitheggs
eggs +=
supervisor
supervisor
[versions]
[versions]
...
...
stack/caucase/buildout.cfg
View file @
a7a36453
...
@@ -26,6 +26,7 @@ eggs =
...
@@ -26,6 +26,7 @@ eggs =
${slapos-cookbook:eggs}
${slapos-cookbook:eggs}
plone.recipe.command
plone.recipe.command
slapos.recipe.template
slapos.recipe.template
scripts =
[caucase-jinja2-library]
[caucase-jinja2-library]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
...
stack/erp5/buildout.cfg
View file @
a7a36453
...
@@ -86,6 +86,7 @@ parts +=
...
@@ -86,6 +86,7 @@ parts +=
# some additional utils
# some additional utils
zodbanalyze
zodbanalyze
zodbpack
# Create instance template
# Create instance template
template
template
...
@@ -518,7 +519,6 @@ entry-points =
...
@@ -518,7 +519,6 @@ entry-points =
scripts =
scripts =
apachedex
apachedex
performance_tester_erp5
performance_tester_erp5
repozo
runwsgi
runwsgi
runzope
runzope
runzeo
runzeo
...
@@ -556,22 +556,21 @@ scripts = zodbanalyze
...
@@ -556,22 +556,21 @@ scripts = zodbanalyze
recipe = zc.recipe.egg:develop
recipe = zc.recipe.egg:develop
setup = ${erp5:location}
setup = ${erp5:location}
[
slapos-deps-eggs
]
[
zodbpack
]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs +=
eggs =
${lxml-python:egg}
${pycurl:egg}
${python-PyYAML:egg}
${python-cryptography:egg}
${python-cliff:egg}
slapos.toolbox[zodbpack]
slapos.toolbox[zodbpack]
scripts +=
scripts =
is-local-tcp-port-opened
is-process-older-than-dependency-set
check-slow-queries-digest-result
check-apachedex-result
check-computer-memory
runApacheDex
zodbpack
zodbpack
[versions]
[versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
# neoppod, mysqlclient, slapos.recipe.template
& [slapos-deps-eggs]
# neoppod, mysqlclient, slapos.recipe.template
# patched eggs
# patched eggs
Acquisition = 2.13.12+SlapOSPatched001
Acquisition = 2.13.12+SlapOSPatched001
...
...
stack/monitor/buildout.cfg
View file @
a7a36453
...
@@ -13,7 +13,6 @@ extends =
...
@@ -13,7 +13,6 @@ extends =
parts =
parts =
slapos-cookbook
slapos-cookbook
monitor-eggs
extra-eggs
extra-eggs
monitor2-template
monitor2-template
...
@@ -31,7 +30,7 @@ destination = ${buildout:parts-directory}/monitor-scripts
...
@@ -31,7 +30,7 @@ destination = ${buildout:parts-directory}/monitor-scripts
on-update = true
on-update = true
[monitor-eggs]
[monitor-eggs]
recipe = zc.recipe.egg
# XXX: merge with extra-eggs?
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
${pycurl:egg}
${pycurl:egg}
...
@@ -42,9 +41,6 @@ eggs =
...
@@ -42,9 +41,6 @@ eggs =
slapos.toolbox
slapos.toolbox
slapos.core
slapos.core
# Do no generate any scripts here as all of them are generated by extraeggs
scripts =
[extra-eggs]
[extra-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
interpreter = pythonwitheggs
interpreter = pythonwitheggs
...
@@ -105,8 +101,6 @@ context =
...
@@ -105,8 +101,6 @@ context =
raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
raw check_disk_space ${buildout:directory}/bin/check-free-disk
raw check_disk_space ${buildout:directory}/bin/check-free-disk
raw bin_directory ${buildout:directory}/bin
raw bin_directory ${buildout:directory}/bin
depends =
${monitor-eggs:eggs}
[versions]
[versions]
cns.recipe.symlink = 0.2.3
cns.recipe.symlink = 0.2.3
...
...
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