diff --git a/component/cythonplus/buildout.cfg b/component/cythonplus/buildout.cfg index ff215ddff38da515ca66a8bdc5cb1f2ae4f00674..b443a75b95da8cd587211d5b602d82f510403645 100644 --- a/component/cythonplus/buildout.cfg +++ b/component/cythonplus/buildout.cfg @@ -54,6 +54,5 @@ context = import easy_install zc.buildout.easy_install [versions] -slapos.recipe.template = 4.4 coverage = 4.5.1 pycodestyle = 2.5.0 diff --git a/component/jupyter-py2/buildout.cfg b/component/jupyter-py2/buildout.cfg index f1cad3f98cdd543e050ee9e0bc6dc758b382802b..13a55d5e221b236f757845d132037116d6f8e54a 100644 --- a/component/jupyter-py2/buildout.cfg +++ b/component/jupyter-py2/buildout.cfg @@ -89,7 +89,6 @@ pyzmq = 16.0.2 scikit-learn = 0.18.1 seaborn = 0.7.1 simplegeneric = 0.8.1 -slapos.recipe.template = 4.4 statsmodels = 0.8.0 terminado = 0.6 tornado = 4.4.2 diff --git a/software/agent/software.cfg b/software/agent/software.cfg index a2a587d8c61ad0c2bb8612f460f2c8b816c00028..2452879a5d43827d100a0a34a9f66ecf234d82dd 100644 --- a/software/agent/software.cfg +++ b/software/agent/software.cfg @@ -48,5 +48,4 @@ gitdb = 0.6.4 pycrypto = 2.6.1 pycurl = 7.43.0 slapos.recipe.download = 1.0 -slapos.recipe.template = 4.4 smmap = 0.9.0 diff --git a/software/ajaxplorer/software.cfg b/software/ajaxplorer/software.cfg index d85f39434650fcec413c2dd60688bbbc63636ad9..098efda43168eb6c5bb11d94bbfbb871d1253b79 100644 --- a/software/ajaxplorer/software.cfg +++ b/software/ajaxplorer/software.cfg @@ -84,5 +84,4 @@ numpy = 1.16.4 # websockify 0.4.1 doesn't install well websockify = 0.3.0 plone.recipe.command = 1.1 -slapos.recipe.template = 2.4.2 z3c.recipe.mkdir = 0.5 diff --git a/software/backupserver/software.cfg b/software/backupserver/software.cfg index 295caefb4135dfc8de3cae51bb66d21697a11136..caa4151443ad040fbb35f0c95077f2a4b0f76941 100644 --- a/software/backupserver/software.cfg +++ b/software/backupserver/software.cfg @@ -105,5 +105,4 @@ mode = 0644 rdiff-backup = 1.0.5+SlapOSPatched001 gunicorn = 19.1.1 plone.recipe.command = 1.1 -slapos.recipe.template = 2.4.3 PyRSS2Gen = 1.1 diff --git a/software/build-rina/software.cfg b/software/build-rina/software.cfg index 20fd325b7469ccaf14aff7ac68dff82a01a92149..2b89a0f23dd80fba27f03f312130ca7bda44b244 100644 --- a/software/build-rina/software.cfg +++ b/software/build-rina/software.cfg @@ -82,6 +82,3 @@ packages += dh-autoreconf pkg-config doxygen maven xmlto # hellorina (shouldn't parts like lxml-python depend on the python of the SR?) python-dev - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/buildout-testing/software.cfg b/software/buildout-testing/software.cfg index 061335c3ff82edb98eb820197b339bd5ea598c1c..7be754e06cda16942abef6d2c5cc7e0811a90fd3 100644 --- a/software/buildout-testing/software.cfg +++ b/software/buildout-testing/software.cfg @@ -59,6 +59,3 @@ template = key slapos_buildout slapos.buildout-repository:location key temp_directory directory:tmp raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter} - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/caddy-frontend/software.cfg b/software/caddy-frontend/software.cfg index 4c6d4b2bcc2a54d7248cd35472ddb93049323195..b69e69fb51e8b3a096f825232107265c51bff761 100644 --- a/software/caddy-frontend/software.cfg +++ b/software/caddy-frontend/software.cfg @@ -246,7 +246,6 @@ gitdb = 0.6.4 plone.recipe.command = 1.1 pycrypto = 2.6.1 rdiff-backup = 1.0.5+SlapOSPatched001 -slapos.recipe.template = 4.4 smmap = 0.9.0 websockify = 0.8.0 diff --git a/software/caucase/software.cfg b/software/caucase/software.cfg index 27ab39df38877b9931cd0d46f1bdb1adde824ae6..f995228067fadb37e78c7e134a160c89eb191bc2 100644 --- a/software/caucase/software.cfg +++ b/software/caucase/software.cfg @@ -24,6 +24,3 @@ context = key eggs_directory buildout:eggs-directory key caucase_jinja2_library caucase-jinja2-library:target key instance_caucased instance-caucased:target - -[versions] -slapos.recipe.template = 3.0 diff --git a/software/cdn-me/software.cfg b/software/cdn-me/software.cfg index e958a4a00f89dccf07ddfbd2ddd571bdc9531bd4..18bffcf90d7dde214014d673a33e1c59fdf56005 100644 --- a/software/cdn-me/software.cfg +++ b/software/cdn-me/software.cfg @@ -39,4 +39,3 @@ eggs = cns.recipe.symlink = 0.2.3 collective.recipe.environment = 0.2.0 plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 diff --git a/software/cythonplus-dev/software.cfg b/software/cythonplus-dev/software.cfg index ffa01b336514f89c828fa245e83c8f1a59f93c7b..9ce350a132d424988f69ca94a557805787964122 100644 --- a/software/cythonplus-dev/software.cfg +++ b/software/cythonplus-dev/software.cfg @@ -21,6 +21,3 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_} recipe = zc.recipe.egg eggs = erp5.util interpreter = ${:_buildout_section_name_} - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/davstorage/development.cfg b/software/davstorage/development.cfg index 50a1e0cd5a904abd02b2b4e0ae29faab5c682d34..27b40c63bbac9f10cf4110bc336b96a823662b66 100644 --- a/software/davstorage/development.cfg +++ b/software/davstorage/development.cfg @@ -34,4 +34,3 @@ command = [versions] openssl = 1.0.1c -slapos.recipe.template = 2.4.2 diff --git a/software/davstorage/software.cfg b/software/davstorage/software.cfg index 50a1e0cd5a904abd02b2b4e0ae29faab5c682d34..27b40c63bbac9f10cf4110bc336b96a823662b66 100644 --- a/software/davstorage/software.cfg +++ b/software/davstorage/software.cfg @@ -34,4 +34,3 @@ command = [versions] openssl = 1.0.1c -slapos.recipe.template = 2.4.2 diff --git a/software/dream/software.cfg b/software/dream/software.cfg index 20e3e5702d0c040ed56cc16907bcd7adfff26663..f39fb6b6d18cc0e650fd6e318d3f67b77a042cf6 100644 --- a/software/dream/software.cfg +++ b/software/dream/software.cfg @@ -49,7 +49,6 @@ mysqlclient = 1.3.12 # indirect dependancies cp.recipe.cmd = 0.5 plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 zope.exceptions = 4.0.7 zope.testing = 4.1.3 zc.recipe.testrunner = 2.0.0 diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index 7fb38e2f3fa20b4c802b2d1dcb8a500475344b2c..5de7c217b209af7a83463d3e6fe0817d2f447e4a 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -42,7 +42,6 @@ output = ${buildout:directory}/template-default.cfg mode = 0644 [versions] -slapos.recipe.template = 4.4 dnspython = 1.15.0 PyXML = 0.8.5 WebOb = 1.8.5 diff --git a/software/erp5testnode/testsuite/dummy/software.cfg b/software/erp5testnode/testsuite/dummy/software.cfg index 6d90b7159eff931f1a98c368cdcb86e36a62f9ef..611a766bbf54efdb435504e5661a632cb9f3d14f 100644 --- a/software/erp5testnode/testsuite/dummy/software.cfg +++ b/software/erp5testnode/testsuite/dummy/software.cfg @@ -13,6 +13,3 @@ url = ${:_profile_base_location_}/instance.cfg output = ${buildout:directory}/template.cfg md5sum = 9fccb9600a085691ab0f9a20cd615c01 mode = 0644 - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/fluentd/software.cfg b/software/fluentd/software.cfg index 48edcbe16b3cf85a5eca54c3e87068e462054b93..ae21a43229b9004d048f79f06ec35d14cf0a5b1f 100644 --- a/software/fluentd/software.cfg +++ b/software/fluentd/software.cfg @@ -21,6 +21,3 @@ context = gems += fluent-plugin-wendelin==0.4 fluent-plugin-bin - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/galene/software.cfg b/software/galene/software.cfg index 7986f21a95ef357e4e6b441d7d8a4ae6ee10abce..9ecbf20b60a78148547a0c8d24b3764fd492d13b 100644 --- a/software/galene/software.cfg +++ b/software/galene/software.cfg @@ -43,6 +43,3 @@ environment = recipe = slapos.recipe.template url = ${:_profile_base_location_}/${:filename} output = ${buildout:directory}/instance.cfg - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg index 5280ad77fc90325ff5ea0ae3475e149410627750..467ad0d9242feb9bc2dda1623f8f20424569f862 100644 --- a/software/gitlab/software.cfg +++ b/software/gitlab/software.cfg @@ -405,5 +405,4 @@ strip-top-level-dir = true cns.recipe.symlink = 0.2.3 docutils = 0.12 plone.recipe.command = 1.1 -slapos.recipe.template = 4.3 z3c.recipe.scripts = 1.0.1 diff --git a/software/grafana/software.cfg b/software/grafana/software.cfg index 172e285d56e3a0fcba25ef66ca251afe4077dc25..b867aa7ab860c9303bd020f8a68882641c2546ef 100644 --- a/software/grafana/software.cfg +++ b/software/grafana/software.cfg @@ -157,5 +157,4 @@ curl-bin = ${curl:location}/bin/curl dash-bin = ${dash:location}/bin/dash [versions] -slapos.recipe.template = 4.2 inotifyx = 0.2.2 diff --git a/software/hellorina/software.cfg b/software/hellorina/software.cfg index 49f2842b0140d68f7f8ae2ae9c1750d87f55108d..fd603765d8fab3f6fe17b9d03c97c6db763fa669 100644 --- a/software/hellorina/software.cfg +++ b/software/hellorina/software.cfg @@ -40,6 +40,3 @@ recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/${:_buildout_section_name_} mode = 755 md5sum = 78b77a6bda9958f547f7d89b747731e3 - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/helloworld/software.cfg b/software/helloworld/software.cfg index 7df7d699f317e6d6e1b4dede26d951901cbe2fdc..f181792a473577bb0daa879225381cfc33b499e7 100644 --- a/software/helloworld/software.cfg +++ b/software/helloworld/software.cfg @@ -53,7 +53,3 @@ context = raw template_monitor ${monitor2-template:rendered} # md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by # calling update-hash - -# Pin versions of eggs used that are not already pinned by stack/slapos.cfg -[versions] -slapos.recipe.template = 4.4 diff --git a/software/html5as/software.cfg b/software/html5as/software.cfg index 49837f365861def15eb9ceec332268cc76e6e53e..3acb83d05497c2047141685fded07a898ea9b5ce 100644 --- a/software/html5as/software.cfg +++ b/software/html5as/software.cfg @@ -71,6 +71,5 @@ async = 0.6.1 gitdb = 0.5.4 pycrypto = 2.6 rdiff-backup = 1.0.5+SlapOSPatched001 -slapos.recipe.template = 4.4 smmap = 0.8.2 plone.recipe.command = 1.1 diff --git a/software/html5ide/software.cfg b/software/html5ide/software.cfg index 78b5ee41cf9cc2611367698b3c5fd2a863ecadfe..1d253cd9cd54bc4eae5a34af4115fe1ddbab1e12 100644 --- a/software/html5ide/software.cfg +++ b/software/html5ide/software.cfg @@ -47,4 +47,3 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 PyRSS2Gen = 1.1 cns.recipe.symlink = 0.2.3 plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 diff --git a/software/htmlvalidatorserver/software.cfg b/software/htmlvalidatorserver/software.cfg index fa15da5523406021876ddfe7c3ece4147dced702..f7abf35245f4914c5969c753461e036032ee5ed1 100644 --- a/software/htmlvalidatorserver/software.cfg +++ b/software/htmlvalidatorserver/software.cfg @@ -50,5 +50,4 @@ mode = 0644 # but '1.3.4nxd2-SlapOSPatched001'. gunicorn = 19.1.1 plone.recipe.command = 1.1 -slapos.recipe.template = 2.4.3 inotifyx = 0.2.2 diff --git a/software/jstestnode/software.cfg b/software/jstestnode/software.cfg index ce870a9926149476c006f7f5711e39de41d18fa8..c67c5611aa00be2de3754f33bfa109fede0738cf 100644 --- a/software/jstestnode/software.cfg +++ b/software/jstestnode/software.cfg @@ -118,7 +118,6 @@ output = ${buildout:directory}/runTestSuite.in [versions] -slapos.recipe.template = 4.4 selenium = 3.14.1 urllib3 = 1.24 certifi = 2018.10.15 diff --git a/software/jupyter/software.cfg b/software/jupyter/software.cfg index 3732d77edff6dc03a6c797288e7f7dbc70e8f1d9..5bcb5b93f7250584a2892814363d73695c09ca4f 100644 --- a/software/jupyter/software.cfg +++ b/software/jupyter/software.cfg @@ -104,7 +104,6 @@ pyzmq = 20.0.0 scikit-learn = 0.20.4 seaborn = 0.7.1 simplegeneric = 0.8.1 -slapos.recipe.template = 4.4 statsmodels = 0.11.1 testpath = 0.4.4 terminado = 0.9.1 diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg index 47d2d49017f0179ef063bb26742d8462a3f27b60..80c47a90b92d5787ebd80850a9ca3db35e95401c 100644 --- a/software/kvm/software.cfg +++ b/software/kvm/software.cfg @@ -205,5 +205,4 @@ websockify = 0.9.0 collective.recipe.environment = 0.2.0 gitdb = 0.6.4 pycurl = 7.43.0 -slapos.recipe.template = 4.4 smmap = 0.9.0 diff --git a/software/metabase/software.cfg b/software/metabase/software.cfg index 03188f08e07805a160128574dbd2b7733f45e160..dc760287ef85c9b305fab6aaacc04bae3228ac1d 100644 --- a/software/metabase/software.cfg +++ b/software/metabase/software.cfg @@ -24,6 +24,3 @@ md5sum = 0a5e780dcf7d9ffe73f1ed789f863a57 recipe = slapos.recipe.template url = ${:_profile_base_location_}/${:filename} output = ${buildout:directory}/instance.cfg - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/monitor/software.cfg b/software/monitor/software.cfg index f6d2d5e3be38ddb2612c6979a7c95cdd16fde57d..98de4a4e7e5c7934b48c50c0f563fa2f472b0662 100644 --- a/software/monitor/software.cfg +++ b/software/monitor/software.cfg @@ -76,7 +76,6 @@ eggs += scripts = [versions] -slapos.recipe.template = 4.4 surykatka = 0.5.0 diff --git a/software/mysql-5.1/software.cfg b/software/mysql-5.1/software.cfg index 3608b2386db78e2983f8841b7d3cf95d3d03034e..a38437c5a569fb15ec683c2978e95f4290bdd0e8 100644 --- a/software/mysql-5.1/software.cfg +++ b/software/mysql-5.1/software.cfg @@ -45,4 +45,3 @@ mode = 0644 [versions] rdiff-backup = 1.0.5+SlapOSPatched001 -slapos.recipe.template = 2.2 diff --git a/software/nayuos/software.cfg b/software/nayuos/software.cfg index c3aabacfa15f28df7eb9a287004c59b48cace6ff..a813fb7900b5d2a938966fd86b7ba97f46530779 100644 --- a/software/nayuos/software.cfg +++ b/software/nayuos/software.cfg @@ -67,6 +67,3 @@ dependencies = libexpat libaio boost-lib - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/neoppod/software-common.cfg b/software/neoppod/software-common.cfg index bf97add3ccdb23d160b81a9e2090aa91e292712f..9c5d4d0e5c6f8aebebea523cd859ef904e7f6f8f 100644 --- a/software/neoppod/software-common.cfg +++ b/software/neoppod/software-common.cfg @@ -146,7 +146,6 @@ persistent = 4.6.4 pycrypto = 2.6.1 pycurl = 7.43.0 setproctitle = 1.1.10 -slapos.recipe.template = 4.4 transaction = 1.7.0 zodbpickle = 1.0.4 cython-zstd = 0.2 diff --git a/software/neoppod/stress-testing/software.cfg b/software/neoppod/stress-testing/software.cfg index a2da69b6744ffa2e6620bc2993204e911f62ee91..177723a079dd0551684d073fb65a0efe1dc34345 100644 --- a/software/neoppod/stress-testing/software.cfg +++ b/software/neoppod/stress-testing/software.cfg @@ -84,6 +84,3 @@ packages += libnetfilter-queue-dev nftables # extra requirements for this SR screen xz-utils - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/nginx-push-stream/software.cfg b/software/nginx-push-stream/software.cfg index d5baeae23f78eb9ba38b8ecc73b3efc06a8030e0..5364c6e5586cf14cde3a6f2f034a3dc0f73aa87f 100644 --- a/software/nginx-push-stream/software.cfg +++ b/software/nginx-push-stream/software.cfg @@ -42,5 +42,4 @@ output = ${buildout:directory}/instance-nginx.cfg.in mode = 0644 [versions] -slapos.recipe.template = 4.4 inotifyx = 0.2.2 diff --git a/software/plantuml/software.cfg b/software/plantuml/software.cfg index 6ea32c0a263167685652f226c457ce0be9bbc11f..30c899bc2546cb76203128f371ac50a1402c6c9b 100644 --- a/software/plantuml/software.cfg +++ b/software/plantuml/software.cfg @@ -32,7 +32,3 @@ output = ${buildout:directory}/${:_buildout_section_name_} recipe = slapos.recipe.build:download url = https://sourceforge.net/projects/plantuml/files/1.2020.15/plantuml.1.2020.15.war md5sum = ed203cb3b90df8f77492fa36ea6490a5 - - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/postgres/software.cfg b/software/postgres/software.cfg index 0dc6c8b2b1e583c0ba6f16402ea5349275c57617..c6b0193f201bbc5b72468c71d01094110ca07a82 100644 --- a/software/postgres/software.cfg +++ b/software/postgres/software.cfg @@ -19,6 +19,3 @@ url = ${:_profile_base_location_}/instance.cfg.in output = ${buildout:directory}/instance.cfg md5sum = d8b833a2054b82b6031a9420008b58fd mode = 0644 - -[versions] -slapos.recipe.template = 2.4.2 diff --git a/software/powerdns/software.cfg b/software/powerdns/software.cfg index 4959f566e6d624c2ed329e4a8bbeeacb504dc39b..e5cbffc91d0ded77db825819cef2fc97c2ef6476 100644 --- a/software/powerdns/software.cfg +++ b/software/powerdns/software.cfg @@ -54,7 +54,6 @@ mode = 0644 PyRSS2Gen = 1.1 cns.recipe.symlink = 0.2.3 plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 passlib = 1.7.1 GitPython = 2.1.11 lockfile = 0.12.2 diff --git a/software/proftpd/software.cfg b/software/proftpd/software.cfg index 623bfe400a389c6f3050dcb611eb01f4d86bd037..ea0ebbf29005678fe27803710ba9266f39982ad8 100644 --- a/software/proftpd/software.cfg +++ b/software/proftpd/software.cfg @@ -46,5 +46,4 @@ context = [versions] collective.recipe.environment = 1.1.0 collective.recipe.grp = 1.1.0 -slapos.recipe.template = 4.4 plone.recipe.command = 1.1 diff --git a/software/pureftpd/software.cfg b/software/pureftpd/software.cfg index aa5ad57968bacd1e8b92b23bb1f1d20a1a903e2b..2e4791e1504304969136da7e3249ae3e69aa21cc 100644 --- a/software/pureftpd/software.cfg +++ b/software/pureftpd/software.cfg @@ -34,7 +34,3 @@ context = raw pureftpd_bin ${pure-ftpd:location}/sbin/pure-ftpd raw pureuploadscript_bin ${pure-ftpd:location}/sbin/pure-uploadscript raw purepw_bin ${pure-ftpd:location}/bin/pure-pw - - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/re6stnet/software.cfg b/software/re6stnet/software.cfg index 7cef81681457919831b241debbe51e145d0f63f2..21de14879000b7e710ae76e9e21d8c9d770575c0 100644 --- a/software/re6stnet/software.cfg +++ b/software/re6stnet/software.cfg @@ -72,7 +72,6 @@ context = [versions] re6stnet = 0.551 -slapos.recipe.template = 4.4 # Required by: # re6stnet==0.533 diff --git a/software/redis-server/software.cfg b/software/redis-server/software.cfg index 4077dfb092cb8ade80628c5e8dea9035cb7d383d..316200fc99a0d7c9d677619f428c6e624d99f35e 100644 --- a/software/redis-server/software.cfg +++ b/software/redis-server/software.cfg @@ -26,4 +26,3 @@ mode = 0644 [versions] plone.recipe.command = 1.1 -slapos.recipe.template = 2.4.2 diff --git a/software/repman/software.cfg b/software/repman/software.cfg index de64465364f733d8dff14a9bfca343f383dc6643..149bb2a5e087fa1ba636f120b95b967563fe331f 100644 --- a/software/repman/software.cfg +++ b/software/repman/software.cfg @@ -149,7 +149,3 @@ link-binary = [proxy-need-start-stop.sh.in] <= download-file - -# Pin versions of eggs used that are not already pinned by stack/slapos.cfg -[versions] -slapos.recipe.template = 4.4 diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg index a43ae7006cbbec3f35d84e4b50a746c0f4b7b71f..933d59f309bfc8f58dda7469ef8351c5d9625a47 100644 --- a/software/seleniumrunner/software.cfg +++ b/software/seleniumrunner/software.cfg @@ -56,4 +56,3 @@ output = ${buildout:directory}/template.cfg [versions] plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 diff --git a/software/seleniumserver/software.cfg b/software/seleniumserver/software.cfg index b5227546b06e11c2e4903823548e1757b0408927..0b4061d8a34280aa88f3e909d6e41c0869f06abd 100644 --- a/software/seleniumserver/software.cfg +++ b/software/seleniumserver/software.cfg @@ -75,4 +75,3 @@ post-install = [versions] plone.recipe.command = 1.1 -slapos.recipe.template = 4.4 diff --git a/software/slapos-in-partition/software.cfg b/software/slapos-in-partition/software.cfg index f0850ce18b274b85dcdf9aa051714ba8b18ae81f..e4fba073ad6e547e4cefd868cebbaebd10a66bb5 100644 --- a/software/slapos-in-partition/software.cfg +++ b/software/slapos-in-partition/software.cfg @@ -11,4 +11,3 @@ extends = common.cfg Pygments = 1.6 collective.recipe.environment = 0.2.0 collective.recipe.template = 1.10 -slapos.recipe.template = 4.4 diff --git a/software/slapos-sr-testing/software.cfg b/software/slapos-sr-testing/software.cfg index c78d77c8af1d090f0b46222248ebae7bcb39b78b..41a200726e545b481d9511ec148552ee1e5fa531 100644 --- a/software/slapos-sr-testing/software.cfg +++ b/software/slapos-sr-testing/software.cfg @@ -294,7 +294,6 @@ plantuml = 0.3.0 pysftp = 0.2.9 requests-toolbelt = 0.8.0 selenium = 3.141.0 -slapos.recipe.template = 4.4 # Patched eggs PyPDF2 = 1.26.0+SlapOSPatched001 diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg index f39e903f1bd7340eb0e29a849113c3128360f9ae..d96ca56d030ed559480f861ac41fecc1a38a2bda 100644 --- a/software/slaprunner/software.cfg +++ b/software/slaprunner/software.cfg @@ -176,7 +176,6 @@ gitdb = 0.6.4 gunicorn = 19.10.0 prettytable = 0.7.2 pycurl = 7.43.0 -slapos.recipe.template = 4.4 collective.recipe.environment = 0.2.0 smmap = 0.9.0 lockfile = 0.12.2 diff --git a/software/srslte/software.cfg b/software/srslte/software.cfg index bcf1f79fecf695676b219a4e16af224c3fd5a5a0..f401227d4645b3aec5207baf38a388fa25f0b7f7 100644 --- a/software/srslte/software.cfg +++ b/software/srslte/software.cfg @@ -73,5 +73,4 @@ url = ${:_profile_base_location_}/config/${:filename} filename = user_db.csv [versions] -slapos.recipe.template = 4.4 apache-libcloud = 2.4.0 diff --git a/software/test-slave-instance-deployment/software.cfg b/software/test-slave-instance-deployment/software.cfg index e977de7851eabb839d07f9f799d6f2e1c6495030..e30802804930892f05cf1f096c3c76053e2e92d3 100644 --- a/software/test-slave-instance-deployment/software.cfg +++ b/software/test-slave-instance-deployment/software.cfg @@ -59,7 +59,6 @@ eggs = collective.recipe.template collective.recipe.template = 1.11 plone.recipe.command = 1.1 slapos.recipe.build = 0.28 -slapos.recipe.template = 4.4 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test. [buildout] diff --git a/software/theia/software.cfg b/software/theia/software.cfg index 4525c0a9b00af4dad754a2e9200fdb943682e660..174a5378da2408bd4a7c4adf064de1b2046143d9 100644 --- a/software/theia/software.cfg +++ b/software/theia/software.cfg @@ -390,6 +390,3 @@ template = [instance] <= template-base output = ${buildout:directory}/instance.cfg - -[versions] -slapos.recipe.template = 4.5 diff --git a/software/turnserver/software.cfg b/software/turnserver/software.cfg index 8d894c2b7a3b933d5daab0ef71f8001a13de5ab9..51bd5076e9663eed06581f4ca7d73b87398c65dd 100644 --- a/software/turnserver/software.cfg +++ b/software/turnserver/software.cfg @@ -30,6 +30,3 @@ output = ${buildout:directory}/instance.cfg [template-insecure-turnserver] <= download-base - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/varnish/software.cfg b/software/varnish/software.cfg index 207a7ce0f1e82b0fee0179ecb6a5bb4c70f183ab..f92cdd29f4fce346fa40f02a87dbc681d9dc7f21 100644 --- a/software/varnish/software.cfg +++ b/software/varnish/software.cfg @@ -59,6 +59,3 @@ recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/instance-varnish.cfg.in md5sum = 0ea12a4ad2d2e3d406476e35b8d3e3fb mode = 640 - -[versions] -slapos.recipe.template = 4.4 diff --git a/software/zabbix-agent/software.cfg b/software/zabbix-agent/software.cfg index b78ba34a1510fa54e8acb989ab8491d1f87f3bfd..12c53d52dff7f95cee44442058b5c42273b457fd 100644 --- a/software/zabbix-agent/software.cfg +++ b/software/zabbix-agent/software.cfg @@ -17,6 +17,3 @@ url = ${:_profile_base_location_}/instance.cfg md5sum = 98a680fe8fddce5dcee455e65c228fde output = ${buildout:directory}/template.cfg mode = 0644 - -[versions] -slapos.recipe.template = 2.4.2 diff --git a/stack/cloudooo.cfg b/stack/cloudooo.cfg index cdfc0f208fa637af4ce8b523c9c7ba7cce6e035d..234878d4586539ba469e757b50ceea5f3a7186ce 100644 --- a/stack/cloudooo.cfg +++ b/stack/cloudooo.cfg @@ -78,7 +78,6 @@ WSGIUtils = 0.7.2 WSGIserver = 1.3 python-magic = 0.4.18 rdiff-backup = 1.0.5+SlapOSPatched001 -slapos.recipe.template = 4.4 # Required by: # PasteScript== 3.2.0 diff --git a/stack/nxdtest.cfg b/stack/nxdtest.cfg index b9b74912b71853e4a634d574664a486f64520d1e..c50e3d5f3914e0818067ac053aaccb1c184df809 100644 --- a/stack/nxdtest.cfg +++ b/stack/nxdtest.cfg @@ -50,7 +50,3 @@ template = ${:_profile_base_location_}/nxdtest/${:filename} context = section buildout buildout section nxdtest nxdtest - - -[versions] -slapos.recipe.template = 4.4 diff --git a/stack/slapos.cfg b/stack/slapos.cfg index d003125f2ccf17a186bc3b551230be88489f744d..d77068d4f3e77ed813e05918f2684b3093b0b712 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -199,6 +199,7 @@ slapos.libnetworkcache = 0.20 slapos.rebootstrap = 4.5 slapos.recipe.build = 0.46 slapos.recipe.cmmi = 0.16 +slapos.recipe.template = 4.5 slapos.toolbox = 0.112 stevedore = 1.21.0 subprocess32 = 3.5.3