Merge master in lamp-mohamadou branch

slapos/recipe/agent/__init__.py

@@ -55,6 +55,7 @@ class Recipe(BaseSlapRecipe, GenericSlapRecipe):
     configuration.add_section("agent")
     configuration.set("agent", "portal_url", self.parameter_dict["portal_url"])
     configuration.set("agent", "master_url", self.parameter_dict["master_url"])
+    configuration.set("agent", "report_url", self.parameter_dict["report_url"])
     key_filepath = os.path.join(self.work_directory, "key")
     key_file = open(key_filepath, "w")
     key_file.write(self.parameter_dict["key"])
@@ -87,7 +88,7 @@ class Recipe(BaseSlapRecipe, GenericSlapRecipe):
 
     agent_crond_path = os.path.join(self.crond, "agent")
     agent_crond = open(agent_crond_path, "w")
-    agent_crond.write("*/1 * * * * %s -S %s" % \
+    agent_crond.write("*/3 * * * * %s -S %s" % \
       (self.options["python_binary"],
         "%s --pidfile=%s %s" % \
           (self.options["agent_binary"], self.options["pidfile"],

software/memcached/software.cfg

 [buildout]
-
-extensions =
-  slapos.zcbworkarounds
-  slapos.rebootstrap
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 extends =
   ../../component/memcached/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
-#TODO : list here all parts.
   template
-  libxslt
   eggs
   instance-recipe-egg
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
 [instance-recipe]
 egg = slapos.cookbook
 module = memcached
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
 
@@ -85,5 +48,55 @@ hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
 plone.recipe.command = 1.1
 
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+meld3 = 0.6.8
+slapos.recipe.template = 2.3
+
+# Required by:
+# slapos.core==0.2
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.7
+PyXML = 0.8.4
+
+# Required by:
+# slapos.cookbook==0.7
+# slapos.core==0.2
+# xml-marshaller==0.9.7
+lxml = 2.3.4
+
+# Required by:
+# slapos.core==0.2
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.2
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.7
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.2
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----