From 673d1b90f11963da3d35990660e6068459c80dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com> Date: Mon, 2 Sep 2013 15:50:33 +0200 Subject: [PATCH] apache-frontend: update versions and md5sum --- software/apache-frontend/common.cfg | 11 +++++------ software/apache-frontend/software.cfg | 23 ++++++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/software/apache-frontend/common.cfg b/software/apache-frontend/common.cfg index cbe8519db..f639b30f1 100644 --- a/software/apache-frontend/common.cfg +++ b/software/apache-frontend/common.cfg @@ -50,7 +50,6 @@ git-executable = ${git:location}/bin/git [slapos-toolbox] recipe = zc.recipe.egg -#python = ${eggs:python} eggs = ${lxml-python:egg} slapos.toolbox @@ -69,27 +68,27 @@ command = [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -#md5sum = 81ab3daac0b6d404744596a2d4f8d8f0 +md5sum = 9c6346c8eaf484748e6be0b62b65cf2e output = ${buildout:directory}/template.cfg mode = 0644 [template-apache-frontend] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-apache-frontend.cfg -#md5sum = 81ab3daac0b6d404744596a2d4f8d8f0 +md5sum = 7e7e7599ec41cf1eb6e8e725d855c345 output = ${buildout:directory}/template-apache-frontend.cfg mode = 0644 [template-apache-replicate] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in -#md5sum = 81ab3daac0b6d404744596a2d4f8d8f0 +md5sum = 2c96799f1429d0541c04c0875d864777 mode = 0644 [template-slave-list] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in -#md5sum = e0ea94cbd15284464e4f73bac699b996 +md5sum = f5eef006211809669b12422240c6f436 mode = 640 [template-slave-configuration] @@ -124,7 +123,7 @@ mode = 640 [template-custom-slave-list] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/templates/apache-default-slave-list.cfg.in -#md5sum = 62b327008e08940f6f7eda8466976d13 +md5sum = 9362384cd80727987b34c7746a6de196 mode = 640 [template-not-found-html] diff --git a/software/apache-frontend/software.cfg b/software/apache-frontend/software.cfg index 8a59a1d0b..be8a2676c 100644 --- a/software/apache-frontend/software.cfg +++ b/software/apache-frontend/software.cfg @@ -18,6 +18,15 @@ slapos.recipe.template = 2.4.2 slapos.toolbox = 0.34.0 smmap = 0.8.2 z3c.recipe.scripts = 1.0.1 +cliff = 1.4.4 +cmd2 = 0.6.5.1 +prettytable = 0.7.2 +requests = 1.2.3 +slapos.cookbook = 0.82 + +# Required by: +# slapos.cookbook==0.82 +lock-file = 2.0 # Required by: # slapos.core==0.35.1 @@ -37,17 +46,17 @@ atomize = 0.1.1 feedparser = 5.1.3 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 inotifyx = 0.2.0 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 # slapos.core==0.35.1 # xml-marshaller==0.9.7 lxml = 3.1.2 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 netaddr = 0.7.10 # Required by: @@ -67,11 +76,11 @@ psutil = 0.7.0 pyflakes = 0.7 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 pytz = 2013b # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 # slapos.core==0.35.1 # slapos.toolbox==0.34.0 # zc.buildout==1.6.0-dev-SlapOS-010 @@ -79,7 +88,7 @@ pytz = 2013b setuptools = 0.6c12dev-r88846 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 # slapos.toolbox==0.34.0 slapos.core = 0.35.1 @@ -92,7 +101,7 @@ supervisor = 3.0b1 unittest2 = 0.5.1 # Required by: -# slapos.cookbook==0.77.1 +# slapos.cookbook==0.82 # slapos.toolbox==0.34.0 xml-marshaller = 0.9.7 -- 2.30.9