Skip to content

slapos
slapos
Commit 77bcd91a authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Merge branch 'master' into '1.0' 

Update Release Candidate



See merge request !53
parents 27c21807 cb0758fe
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 109 deletions
component/gcc/buildout.cfg
View file @ 77bcd91a
...@@ -32,8 +32,8 @@ environment = ...@@ -32,8 +32,8 @@ environment =
[isl] [isl]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.14.tar.bz2 url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.16.1.tar.bz2
md5sum = acd347243fca5609e3df37dba47fd0bb md5sum = ac1f25a0677912952718a51f5bc20f32
configure-options = configure-options =
--with-gmp-prefix=${gmp:location} --with-gmp-prefix=${gmp:location}
--disable-static --disable-static
...@@ -42,8 +42,8 @@ environment = ...@@ -42,8 +42,8 @@ environment =
[gcc-common] [gcc-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/gcc/gcc-5.2.0/gcc-5.2.0.tar.bz2 url = http://ftp.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2
md5sum = a51bcfeb3da7dd4c623e27207ed43467 md5sum = c9616fd448f980259c31de613e575719
# make install does not work when several core are used # make install does not work when several core are used
make-targets = install -j1 make-targets = install -j1
......
component/libreoffice-bin/buildout.cfg
View file @ 77bcd91a
...@@ -9,14 +9,14 @@ parts = ...@@ -9,14 +9,14 @@ parts =
[libreoffice-bin] [libreoffice-bin]
recipe = slapos.recipe.build recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64). # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 5.0.0.5 version = 5.1.0.3
url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
# supported architectures md5sums # supported architectures md5sums
md5sum_x86 = d54ebe17b34f39446762e73fc3d31277 md5sum_x86 = 32440c65e746c4816391fa9bb086d526
md5sum_x86-64 = 6e1c97eaa221748e328c80470d296583 md5sum_x86-64 = d649918b6e59fd84b16d8572a27ca19a
# where office code can be found? # where office code can be found?
officedir = libreoffice5.0 officedir = libreoffice5.1
# script to install # script to install
script = script =
......
component/scikit-learn/buildout.cfg
View file @ 77bcd91a
...@@ -13,4 +13,6 @@ parts = ...@@ -13,4 +13,6 @@ parts =
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
egg = scikit-learn egg = scikit-learn
environment = scikit-learn-env environment = scikit-learn-env
setup-eggs = ${numpy:egg} setup-eggs =
${numpy:egg}
${scipy:egg}
slapos/recipe/README.lamp.txt
View file @ 77bcd91a
...@@ -18,7 +18,7 @@ module = lamp.simple ...@@ -18,7 +18,7 @@ module = lamp.simple
you also need to extend lamp.cfg you also need to extend lamp.cfg
extends = extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/lamp.cfg https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.50/stack/lamp.cfg
lamp.runner lamp.runner
......
software/apache-frontend/development.cfg
View file @ 77bcd91a
...@@ -20,8 +20,8 @@ develop = ...@@ -20,8 +20,8 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = frontend branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[check-recipe] [check-recipe]
......
software/bonjourgrid-client/software.cfg
View file @ 77bcd91a
...@@ -72,7 +72,7 @@ stop-on-error = true ...@@ -72,7 +72,7 @@ stop-on-error = true
branch = grid-computing branch = grid-computing
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
software/bonjourgrid/software.cfg
View file @ 77bcd91a
...@@ -151,7 +151,7 @@ stop-on-error = true ...@@ -151,7 +151,7 @@ stop-on-error = true
branch = grid-computing branch = grid-computing
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
software/davstorage/development.cfg
View file @ 77bcd91a
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = davstorage-ajaxplorer branch = davstorage-ajaxplorer
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/davstorage/software.cfg
View file @ 77bcd91a
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = davstorage-ajaxplorer branch = davstorage-ajaxplorer
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/erp5scalabilitytestbed/software.cfg
View file @ 77bcd91a
...@@ -3,7 +3,7 @@ recipe_location = ${:parts-directory}/slapos.cookbook ...@@ -3,7 +3,7 @@ recipe_location = ${:parts-directory}/slapos.cookbook
develop = ${:recipe_location} develop = ${:recipe_location}
extends = extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5scalabilitytestbed:/component/lxml-python/buildout.cfg https://lab.nexedi.com/nexedi/slapos/raw/erp5scalabilitytestbed/component/lxml-python/buildout.cfg
find-links = find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
...@@ -27,7 +27,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link ...@@ -27,7 +27,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = git clone -b erp5scalabilitytestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}" command = git clone -b erp5scalabilitytestbed --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}"
update-command = cd "${:location}" && git fetch --quiet && git reset --hard @{upstream} update-command = cd "${:location}" && git fetch --quiet && git reset --hard @{upstream}
[eggs] [eggs]
......
software/erp5testnode/instance-default.cfg
View file @ 77bcd91a
...@@ -160,4 +160,4 @@ ca-dir = $${rootdirectory:srv}/ca ...@@ -160,4 +160,4 @@ ca-dir = $${rootdirectory:srv}/ca
node-quantity = 1 node-quantity = 1
test-suite-master-url = test-suite-master-url =
instance-dict = instance-dict =
software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/master:/software/seleniumrunner/software.cfg"] software-path-list = ["https://lab.nexedi.com/nexedi/slapos/raw/master/software/seleniumrunner/software.cfg"]
software/erp5testnode/software.cfg
View file @ 77bcd91a
...@@ -55,7 +55,7 @@ recipe = slapos.recipe.template ...@@ -55,7 +55,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg output = ${buildout:directory}/template-default.cfg
mode = 0644 mode = 0644
md5sum = 22ffc8e212dcf2db8ad94cf0e5ac4772 md5sum = 3d6f9c13c47c8b4771f7b427685b7b22
[versions] [versions]
PyXML = 0.8.5 PyXML = 0.8.5
......
software/etherpad-lite/development.cfg
View file @ 77bcd91a
...@@ -13,7 +13,7 @@ develop = ...@@ -13,7 +13,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = etherpad-lite branch = etherpad-lite
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/etherpad-lite/software.cfg
View file @ 77bcd91a
...@@ -13,7 +13,7 @@ develop = ...@@ -13,7 +13,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = etherpad-lite branch = etherpad-lite
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/gateone/software.cfg
View file @ 77bcd91a
...@@ -51,7 +51,7 @@ eggs = ...@@ -51,7 +51,7 @@ eggs =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = re6st-master branch = re6st-master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/kvm/README.txt
View file @ 77bcd91a
...@@ -36,7 +36,7 @@ KVM instance parameters: ...@@ -36,7 +36,7 @@ KVM instance parameters:
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
- frontend-software-type (default: frontend) - frontend-software-type (default: frontend)
- frontend-software-url (default: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg) - frontend-software-url (default: https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg)
- frontend-instance-guid - frontend-instance-guid
- frontend-instance-name (default: VNC Frontend) - frontend-instance-name (default: VNC Frontend)
- nbd-port (default: 1024) - nbd-port (default: 1024)
...@@ -102,7 +102,7 @@ Resilient KVM instance ...@@ -102,7 +102,7 @@ Resilient KVM instance
Like KVM instance, but backed-up (with history) in two places. Like KVM instance, but backed-up (with history) in two places.
:: ::
kvm = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.188:/software/kvm/software.cfg' kvm = 'https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.188/software/kvm/software.cfg'
myresilientkvm = request( myresilientkvm = request(
software_release=kvm, software_release=kvm,
partition_reference="My resilient KVM", partition_reference="My resilient KVM",
......
software/kvm/common.cfg
View file @ 77bcd91a
...@@ -98,7 +98,7 @@ mode = 0644 ...@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644 mode = 644
md5sum = 4aeffb282779b43a55eb9067450cbefc md5sum = 88e1437391d21a49b50848689b1221e5
download-only = true download-only = true
on-update = true on-update = true
...@@ -106,7 +106,7 @@ on-update = true ...@@ -106,7 +106,7 @@ on-update = true
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644 mode = 644
md5sum = 33f5f81dc2a19f74acda8316e5fde25e md5sum = f61e033aedaa8e9836795e36fd12e51d
download-only = true download-only = true
on-update = true on-update = true
......
software/kvm/development.cfg
View file @ 77bcd91a
...@@ -18,7 +18,7 @@ develop = ...@@ -18,7 +18,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = kvm-cluster branch = kvm-cluster
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/kvm/instance-kvm-cluster-input-schema.json
View file @ 77bcd91a
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg" "default": "https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg"
} }
}, },
"type": "object" "type": "object"
......
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @ 77bcd91a
...@@ -34,7 +34,7 @@ state = stopped ...@@ -34,7 +34,7 @@ state = stopped
config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }} config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }} config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg')) }} config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg')) }}
config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }} config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
config-name = {{ instance_name }} config-name = {{ instance_name }}
{% if slapparameter_dict.get('authorized-keys', []) -%} {% if slapparameter_dict.get('authorized-keys', []) -%}
......
software/kvm/instance-kvm-input-schema.json
View file @ 77bcd91a
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg" "default": "https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg"
} }
} }
} }
software/kvm/instance-kvm.cfg.jinja2
View file @ 77bcd91a
...@@ -533,7 +533,7 @@ backup = ${logrotate:backup} ...@@ -533,7 +533,7 @@ backup = ${logrotate:backup}
[slap-parameter] [slap-parameter]
# Default values if not specified # Default values if not specified
frontend-software-type = frontend frontend-software-type = frontend
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg frontend-software-url = https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg
frontend-instance-guid = frontend-instance-guid =
frontend-instance-name = VNC Frontend frontend-instance-name = VNC Frontend
nbd-port = 1024 nbd-port = 1024
......
software/neoppod/software-common.cfg
View file @ 77bcd91a
...@@ -111,20 +111,18 @@ md5sum = febd3ed58043ce1367b86cf6e4e69700 ...@@ -111,20 +111,18 @@ md5sum = febd3ed58043ce1367b86cf6e4e69700
[versions] [versions]
MySQL-python = 1.2.5 MySQL-python = 1.2.5
slapos.recipe.template = 2.8 slapos.recipe.template = 2.9
# patched egg # patched egg
ZODB3 = 3.10.5+SlapOSPatched001 ZODB3 = 3.10.5+SlapOSPatched001
# Required by slapos.toolbox==0.52 # Required by slapos.toolbox==0.52
slapos.toolbox = 0.52 slapos.toolbox = 0.53
apache-libcloud = 0.20.1 apache-libcloud = 0.20.1
atomize = 0.2.0 atomize = 0.2.0
ecdsa = 0.13 ecdsa = 0.13
feedparser = 5.2.1 feedparser = 5.2.1
GitPython = 1.0.1 GitPython = 1.0.2
gitdb = 0.6.4 gitdb = 0.6.4
lockfile = 0.10.2 lockfile = 0.10.2
paramiko = 1.16.0 paramiko = 1.16.0
pycrypto = 2.6.1 pycrypto = 2.6.1
rpdb = 0.1.5
smmap = 0.9.0 smmap = 0.9.0
##
software/slaprunner/common.cfg
View file @ 77bcd91a
...@@ -54,7 +54,7 @@ mode = 0644 ...@@ -54,7 +54,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = 3bac078d89d6a256f01a4f2104ec7e0f md5sum = 61297b0882cc9d674f4099b8abdd413f
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
......
software/slaprunner/development.cfg
View file @ 77bcd91a
...@@ -28,7 +28,7 @@ setup = ${slapos.toolbox-repository:location} ...@@ -28,7 +28,7 @@ setup = ${slapos.toolbox-repository:location}
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = slaprunner-paas branch = slaprunner-paas
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true develop = true
......
software/slaprunner/instance-runner-input-schema.json
View file @ 77bcd91a
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
"slapos-repository": { "slapos-repository": {
"title": "SlapOS Git Repository URL", "title": "SlapOS Git Repository URL",
"description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos' (default is http://git.erp5.org/repos/slapos.git)", "description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos' (default is https://lab.nexedi.com/nexedi/slapos.git)",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"pattern": "^(http|https|ftp)://" "pattern": "^(http|https|ftp)://"
......
software/slaprunner/instance-runner.cfg
View file @ 77bcd91a
...@@ -490,7 +490,7 @@ user-authorized-key = ...@@ -490,7 +490,7 @@ user-authorized-key =
instance-amount = 10 instance-amount = 10
debug = false debug = false
frontend-domain = frontend-domain =
slapos-repository = http://git.erp5.org/repos/slapos.git slapos-repository = https://lab.nexedi.com/nexedi/slapos.git
slapos-software = slapos-software =
slapos-software-type = slapos-software-type =
slapos-reference = master slapos-reference = master
......
software/slaprunner/software.cfg
View file @ 77bcd91a
...@@ -18,13 +18,13 @@ gitdb = 0.6.4 ...@@ -18,13 +18,13 @@ gitdb = 0.6.4
gunicorn = 19.4.5 gunicorn = 19.4.5
prettytable = 0.7.2 prettytable = 0.7.2
pycrypto = 2.6.1 pycrypto = 2.6.1
slapos.recipe.template = 2.8 slapos.recipe.template = 2.9
slapos.toolbox = 0.53 slapos.toolbox = 0.53
smmap = 0.9.0 smmap = 0.9.0
# Required by: # Required by:
# slapos.toolbox==0.53 # slapos.toolbox==0.53
GitPython = 1.0.1 GitPython = 1.0.2
# Required by: # Required by:
# slapos.toolbox==0.53 # slapos.toolbox==0.53
...@@ -41,7 +41,3 @@ lockfile = 0.10.2 ...@@ -41,7 +41,3 @@ lockfile = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.53 # slapos.toolbox==0.53
paramiko = 1.16.0 paramiko = 1.16.0
# Required by:
# slapos.toolbox==0.53
rpdb = 0.1.5
software/test-slave-instance-deployment/software.cfg
View file @ 77bcd91a
...@@ -17,7 +17,7 @@ parts = ...@@ -17,7 +17,7 @@ parts =
# Local development # Local development
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/hexaglobe-watermarking/development.cfg
View file @ 77bcd91a
...@@ -12,7 +12,7 @@ develop += ...@@ -12,7 +12,7 @@ develop +=
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = hexaglobe-watermarking branch = hexaglobe-watermarking
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/lamp-generic/development.cfg
View file @ 77bcd91a
...@@ -28,7 +28,7 @@ git-executable = ${git:location}/bin/git ...@@ -28,7 +28,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = lamp-edge branch = lamp-edge
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/maarch/development.cfg
View file @ 77bcd91a
...@@ -34,7 +34,7 @@ git-executable = ${git:location}/bin/git ...@@ -34,7 +34,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/maarch/migration.txt
View file @ 77bcd91a
...@@ -25,7 +25,7 @@ Hot to install Maarch with SlapOS ...@@ -25,7 +25,7 @@ Hot to install Maarch with SlapOS
The command line to request a partition is: The command line to request a partition is:
slapos request /etc/opt/slapos/slapos-client.cfg maarch-instance-name \ slapos request /etc/opt/slapos/slapos-client.cfg maarch-instance-name \
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.159:/software/maarch/software.cfg \ https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.159/software/maarch/software.cfg \
--type=resilient --configuration maarch-sql-data-file=/tmp/data.sql --type=resilient --configuration maarch-sql-data-file=/tmp/data.sql
If you are not migrating data, don't provide the maarch-sql-data-file parameter. If you are not migrating data, don't provide the maarch-sql-data-file parameter.
......
software/unstable/maarch/software.cfg
View file @ 77bcd91a
...@@ -23,7 +23,7 @@ develop = ...@@ -23,7 +23,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
revision = 7285bc913e6ea46a36ad2a887af6e9fab010ca74 revision = 7285bc913e6ea46a36ad2a887af6e9fab010ca74
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/nosqltestbed/software.cfg
View file @ 77bcd91a
...@@ -38,7 +38,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link ...@@ -38,7 +38,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone -b nosqltestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}" command = "${git:location}/bin/git" clone -b nosqltestbed --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}"
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream} update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
[eggs] [eggs]
......
software/unstable/pulse/software.cfg
View file @ 77bcd91a
...@@ -98,7 +98,7 @@ git_param =--quiet -b pulse ...@@ -98,7 +98,7 @@ git_param =--quiet -b pulse
git = ${git:location}/bin/git git = ${git:location}/bin/git
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
command = "${:git}" clone ${:git_param} http://git.erp5.org/repos/slapos.git "${:location}" || exit 1; command = "${:git}" clone ${:git_param} https://lab.nexedi.com/nexedi/slapos.git "${:location}" || exit 1;
update-command = cd "${:location}" && "${:git}" fetch --quiet && "${:git}" reset --hard @{upstream} update-command = cd "${:location}" && "${:git}" fetch --quiet && "${:git}" reset --hard @{upstream}
[instance-recipe-egg] [instance-recipe-egg]
......
software/unstable/reverse-proxy-nginx/development.cfg
View file @ 77bcd91a
...@@ -12,7 +12,7 @@ develop = ...@@ -12,7 +12,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = slaprunner branch = slaprunner
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/trac-svn/software.cfg
View file @ 77bcd91a
...@@ -157,7 +157,7 @@ stop-on-error = true ...@@ -157,7 +157,7 @@ stop-on-error = true
branch = trac branch = trac
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
software/unstable/tt-rss/development.cfg
View file @ 77bcd91a
...@@ -31,7 +31,7 @@ git-executable = ${git:location}/bin/git ...@@ -31,7 +31,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = tt-rss branch = tt-rss
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/zimbra-kvm/development.cfg
View file @ 77bcd91a
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = zimbra-kvm branch = zimbra-kvm
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/unstable/zimbra-kvm/instance-kvm.cfg.in
View file @ 77bcd91a
...@@ -217,7 +217,7 @@ config-custom_domain = $${slap-parameter:domain} ...@@ -217,7 +217,7 @@ config-custom_domain = $${slap-parameter:domain}
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = SMTP Frontend name = SMTP Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
#software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg #software-url = https://lab.nexedi.com/nexedi/slapos/raw/zimbra-kvm/software/reverse-proxy-nginx/development.cfg
software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg
slave = true slave = true
config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6} config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
...@@ -238,7 +238,7 @@ smtp-listening-ipv4 = $${request-smtp-frontend:connection-listening-ipv4} ...@@ -238,7 +238,7 @@ smtp-listening-ipv4 = $${request-smtp-frontend:connection-listening-ipv4}
# Default values if not specified # Default values if not specified
frontend-instance-guid = frontend-instance-guid =
frontend-software-type = frontend frontend-software-type = frontend
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg frontend-software-url = https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg
ram-size = 4096 ram-size = 4096
disk-size = 50 disk-size = 50
......
software/varnish/software.cfg
View file @ 77bcd91a
...@@ -33,7 +33,7 @@ parts = ...@@ -33,7 +33,7 @@ parts =
# Local development # Local development
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
software/wordpress/development.cfg
View file @ 77bcd91a
...@@ -32,7 +32,7 @@ git-executable = ${git:location}/bin/git ...@@ -32,7 +32,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = lapp-resilient3 branch = lapp-resilient3
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
stack/erp5/buildout.cfg
View file @ 77bcd91a
...@@ -605,7 +605,7 @@ setup = ${erp5:location} ...@@ -605,7 +605,7 @@ setup = ${erp5:location}
[cloudooo-repository] [cloudooo-repository]
branch = branch =
revision = f1545ad0e6db238d22fd8c84a149b004ab6b8f03 revision = 9d3317fc1efaee317af95443121ae30a0596b35c
[slapos-deps-eggs] [slapos-deps-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -633,6 +633,7 @@ cloudooo = 1.2.5-dev ...@@ -633,6 +633,7 @@ cloudooo = 1.2.5-dev
# use newer version than specified in ZTK # use newer version than specified in ZTK
PasteDeploy = 1.5.2 PasteDeploy = 1.5.2
Pygments = 2.0.2 Pygments = 2.0.2
argparse = 1.4.0
coverage = 4.0.3 coverage = 4.0.3
zope.dottedname = 4.1.0 zope.dottedname = 4.1.0
...@@ -665,7 +666,7 @@ zope.app.publication = 3.14.0 ...@@ -665,7 +666,7 @@ zope.app.publication = 3.14.0
zope.app.testing = 3.8.1 zope.app.testing = 3.8.1
# Pinned versions # Pinned versions
Pillow = 3.1.0 Pillow = 3.1.1
Products.CMFActionIcons = 2.1.3 Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1 Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 2.0.0 Products.ExternalEditor = 2.0.0
...@@ -682,10 +683,12 @@ StructuredText = 2.11.1 ...@@ -682,10 +683,12 @@ StructuredText = 2.11.1
WSGIUtils = 0.7 WSGIUtils = 0.7
# astroid 1.4.1 breaks testDynamicClassGeneration # astroid 1.4.1 breaks testDynamicClassGeneration
astroid = 1.3.8 astroid = 1.3.8
backports-abc = 0.4
chardet = 2.3.0 chardet = 2.3.0
cns.recipe.symlink = 0.2.3
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
erp5diff = 0.8.1.7 erp5diff = 0.8.1.7
eventlet = 0.18.1 eventlet = 0.18.4
five.formlib = 1.0.4 five.formlib = 1.0.4
five.localsitemanager = 2.0.5 five.localsitemanager = 2.0.5
greenlet = 0.4.9 greenlet = 0.4.9
...@@ -693,33 +696,40 @@ http-parser = 0.8.3 ...@@ -693,33 +696,40 @@ http-parser = 0.8.3
httplib2 = 0.9.2 httplib2 = 0.9.2
huBarcode = 1.0.0 huBarcode = 1.0.0
interval = 1.0.0 interval = 1.0.0
ipdb = 0.8.1 ipdb = 0.8.3
ipython = 4.0.0 ipython = 4.1.1
ipywidgets = 4.1.1
logilab-common = 1.1.0 logilab-common = 1.1.0
matplotlib = 1.4.3 matplotlib = 1.5.1
mistune = 0.7.1
numpy = 1.10.4 numpy = 1.10.4
objgraph = 2.0.1 objgraph = 2.0.1
pandas = 0.16.1 pandas = 0.17.1
path.py = 8.1.2
ply = 3.8 ply = 3.8
polib = 1.0.7 polib = 1.0.7
pprofile = 1.8 pprofile = 1.8
ptyprocess = 0.5 ptyprocess = 0.5.1
pycountry = 1.19 pycountry = 1.20
pyflakes = 1.0.0 pyflakes = 1.0.0
# pylint 1.5.1 breaks testDynamicClassGeneration # pylint 1.5.1 breaks testDynamicClassGeneration
pylint = 1.4.4 pylint = 1.4.4
python-memcached = 1.57 python-memcached = 1.57
pytracemalloc = 1.2 pytracemalloc = 1.2
pyzmq = 15.2.0
qrcode = 5.2.2 qrcode = 5.2.2
restkit = 4.2.2 restkit = 4.2.2
rtjp-eventlet = 0.3.2 rtjp-eventlet = 0.3.2
scikit-learn = 0.16.1 scikit-learn = 0.17.1
scipy = 0.17.0
simplegeneric = 0.8.1 simplegeneric = 0.8.1
socketpool = 0.5.3 socketpool = 0.5.3
spyne = 2.12.11 spyne = 2.12.11
suds = 0.4 suds = 0.4
terminado = 0.6
threadframe = 0.2 threadframe = 0.2
timerserver = 2.0.2 timerserver = 2.0.2
tornado = 4.3
urlnorm = 1.1.2 urlnorm = 1.1.2
uuid = 1.30 uuid = 1.30
validictory = 1.0.1 validictory = 1.0.1
...@@ -730,33 +740,77 @@ xupdate-processor = 0.4 ...@@ -730,33 +740,77 @@ xupdate-processor = 0.4
# Products.CMFCore==2.2.9 # Products.CMFCore==2.2.9
Products.ZSQLMethods = 2.13.4 Products.ZSQLMethods = 2.13.4
# Required by:
# tornado==4.3
backports.ssl-match-hostname = 3.5.0.1
# Required by:
# tornado==4.3
certifi = 2015.11.20.1
# Required by: # Required by:
# qrcode==5.2.2 # qrcode==5.2.2
colorama = 0.3.6 colorama = 0.3.6
# Required by:
# matplotlib==1.5.1
cycler = 0.10.0
# Required by:
# ipython==4.1.1
# traitlets==4.1.0
decorator = 4.0.9
# Required by: # Required by:
# SOAPpy===0.12.0nxd001 # SOAPpy===0.12.0nxd001
fpconst = 0.7.2 fpconst = 0.7.2
# Required by: # Required by:
# traitlets==4.0.0 # ipywidgets==4.1.1
# notebook==4.1.0
ipykernel = 4.2.2
# Required by:
# nbformat==4.0.1
# notebook==4.1.0
# traitlets==4.1.0
ipython-genutils = 0.1.0 ipython-genutils = 0.1.0
# Required by: # Required by:
# pickleshare==0.5 # notebook==4.1.0
path.py = 8.1.2 nbconvert = 4.1.0
# Required by:
# nbconvert==4.1.0
# notebook==4.1.0
nbformat = 4.0.1
# Required by:
# ipywidgets==4.1.1
notebook = 4.1.0
# Required by: # Required by:
# ipython==4.0.0 # ipython==4.1.1
pexpect = 4.0.1 pexpect = 4.0.1
# Required by: # Required by:
# ipython==4.0.0 # ipython==4.1.1
pickleshare = 0.5 pickleshare = 0.6
# Required by:
# matplotlib==1.5.1
# pandas==0.17.1
python-dateutil = 2.4.2
# Required by:
# tornado==4.3
singledispatch = 3.4.0.3
# Required by: # Required by:
# ipython==4.0.0 # ipython==4.1.1
traitlets = 4.0.0 # ipywidgets==4.1.1
# notebook==4.1.0
traitlets = 4.1.0
# Required by: # Required by:
# zope.app.testing==3.8.1 # zope.app.testing==3.8.1
......
stack/resilient/README.txt
View file @ 77bcd91a
...@@ -22,7 +22,7 @@ pull-backup ...@@ -22,7 +22,7 @@ pull-backup
This software type is defined in This software type is defined in
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/stack/resilient/instance-pull-backup.cfg.in?js=1 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/stack/resilient/instance-pull-backup.cfg.in
and there should be no reason to modify or extend it. and there should be no reason to modify or extend it.
...@@ -34,7 +34,7 @@ export ...@@ -34,7 +34,7 @@ export
------ ------
example: example:
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/stack/lapp/postgres/instance-postgres-export.cfg.in?js=1 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/stack/lapp/postgres/instance-postgres-export.cfg.in
This is the *active* instance - the one providing live data to the application. This is the *active* instance - the one providing live data to the application.
...@@ -45,11 +45,11 @@ A backup is run via the bin/exporter script: it will ...@@ -45,11 +45,11 @@ A backup is run via the bin/exporter script: it will
The pull-backup, upon receiving the notification, will make a copy of the data and transmit it to the 'import' instances. The pull-backup, upon receiving the notification, will make a copy of the data and transmit it to the 'import' instances.
You should provide the bin/{mysoftware}-exporter script, see for instance You should provide the bin/{mysoftware}-exporter script, see for instance
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/slapos/recipe/postgres/__init__.py?js=1#l207 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/slapos/recipe/postgres/__init__.py#L207
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/slapos/recipe/mydumper.py?js=1#l71 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/slapos/recipe/mydumper.py#L71
By default, as defined in By default, as defined in
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/stack/resilient/pbsready-export.cfg.in?js=1#l27 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/stack/resilient/pbsready-export.cfg.in#L27
the bin/exporter script is run every 60 minutes. the bin/exporter script is run every 60 minutes.
...@@ -58,7 +58,7 @@ import ...@@ -58,7 +58,7 @@ import
------ ------
example: example:
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/stack/lapp/postgres/instance-postgres-import.cfg.in?js=1 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/stack/lapp/postgres/instance-postgres-import.cfg.in
This is the *fallback* instance - the one that can be activated and thus become active. This is the *fallback* instance - the one that can be activated and thus become active.
Any number of import instances can be used. Deciding which one should take over can be done manually Any number of import instances can be used. Deciding which one should take over can be done manually
...@@ -67,8 +67,8 @@ or through a monitoring + election script. ...@@ -67,8 +67,8 @@ or through a monitoring + election script.
You should provide the bin/{mysoftware}-importer script, see for instance You should provide the bin/{mysoftware}-importer script, see for instance
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/slapos/recipe/postgres/__init__.py?js=1#l233 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/slapos/recipe/postgres/__init__.py#L233
http://git.erp5.org/gitweb/slapos.git/blob/HEAD:/slapos/recipe/mydumper.py?js=1#l71 https://lab.nexedi.com/nexedi/slapos/blob/HEAD/slapos/recipe/mydumper.py#L71
......
stack/slapos.cfg
View file @ 77bcd91a
...@@ -67,7 +67,7 @@ networkcache-section = networkcache ...@@ -67,7 +67,7 @@ networkcache-section = networkcache
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
...@@ -109,14 +109,14 @@ hexagonit.recipe.download = 1.7.post4 ...@@ -109,14 +109,14 @@ hexagonit.recipe.download = 1.7.post4
Jinja2 = 2.8 Jinja2 = 2.8
PyYAML = 3.11 PyYAML = 3.11
Werkzeug = 0.11.3 Werkzeug = 0.11.4
buildout-versions = 1.7 buildout-versions = 1.7
cffi = 1.5.0 cffi = 1.5.2
cliff = 1.15.0 cliff = 1.17.0
cmd2 = 0.6.8 cmd2 = 0.6.8
collective.recipe.template = 1.13 collective.recipe.template = 1.13
cryptography = 1.2.2 cryptography = 1.2.2
decorator = 4.0.6 decorator = 4.0.9
idna = 2.0 idna = 2.0
inotifyx = 0.2.2 inotifyx = 0.2.2
itsdangerous = 0.24 itsdangerous = 0.24
...@@ -126,14 +126,14 @@ netaddr = 0.7.18 ...@@ -126,14 +126,14 @@ netaddr = 0.7.18
pbr = 1.8.1 pbr = 1.8.1
plone.recipe.command = 1.1 plone.recipe.command = 1.1
prettytable = 0.7.2 prettytable = 0.7.2
psutil = 3.4.2 psutil = 4.0.0
pyOpenSSL = 0.15.1 pyOpenSSL = 0.15.1
pyasn1 = 0.1.9 pyasn1 = 0.1.9
pyparsing = 2.0.7 pyparsing = 2.1.0
pytz = 2015.7 pytz = 2015.7
requests = 2.9.1 requests = 2.9.1
setuptools = 18.1 setuptools = 19.6.2
simplejson = 3.8.1 simplejson = 3.8.2
six = 1.10.0 six = 1.10.0
slapos.cookbook = 1.0.17 slapos.cookbook = 1.0.17
slapos.core = 1.3.15 slapos.core = 1.3.15
...@@ -141,7 +141,7 @@ slapos.extension.strip = 0.1 ...@@ -141,7 +141,7 @@ slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.5 slapos.libnetworkcache = 0.14.5
slapos.recipe.build = 0.23 slapos.recipe.build = 0.23
slapos.recipe.cmmi = 0.2 slapos.recipe.cmmi = 0.2
stevedore = 1.10.0 stevedore = 1.11.0
unicodecsv = 0.14.1 unicodecsv = 0.14.1
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
...@@ -154,12 +154,7 @@ Flask = 0.10.1 ...@@ -154,12 +154,7 @@ Flask = 0.10.1
MarkupSafe = 0.23 MarkupSafe = 0.23
# Required by: # Required by:
# cliff==1.15.0 # cryptography==1.2.2
# stevedore==1.10.0
argparse = 1.4.0
# Required by:
# cryptography==1.2.1
enum34 = 1.1.2 enum34 = 1.1.2
# Required by: # Required by:
...@@ -167,7 +162,7 @@ enum34 = 1.1.2 ...@@ -167,7 +162,7 @@ enum34 = 1.1.2
functools32 = 3.2.3.post2 functools32 = 3.2.3.post2
# Required by: # Required by:
# cryptography==1.2.1 # cryptography==1.2.2
ipaddress = 1.0.16 ipaddress = 1.0.16
# Required by: # Required by:
...@@ -183,12 +178,12 @@ lock-file = 2.0 ...@@ -183,12 +178,12 @@ lock-file = 2.0
netifaces = 0.10.4 netifaces = 0.10.4
# Required by: # Required by:
# cffi==1.5.0 # cffi==1.5.2
pycparser = 2.14 pycparser = 2.14
# Required by: # Required by:
# slapos.core==1.3.15 # slapos.core==1.3.15
supervisor = 3.2.0 supervisor = 3.2.1
# Required by: # Required by:
# slapos.core==1.3.15 # slapos.core==1.3.15
......
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