Merge branch 'master' into slappromise

CHANGES.txt

 Changes
 =======
 
-0.53 (Unreleased)
+0.60 (Unreleased)
 -----------------
 
-  * No change yet.
+
+0.59 (2012-07-12)
+-----------------
+
+  * Zabbix: add temperature monitoring using custom commands.
+
+0.58 (2012-07-06)
+-----------------
+
+  * Agent rewrite. [Vincent Pelletier]
+
+0.57 (2012-06-22)
+-----------------
+
+  * Do not use system curl. [Romain Courteaud]
+
+0.56 (2012-06-18)
+-----------------
+
+  * Add signalwrapper, generate.mac, generate.password recipes. [Romain
+    Courteaud]
+
+0.55 (2012-06-18)
+-----------------
+
+  * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
+
+0.54.1 (2012-06-18)
+-----------------
+
+  * Fix 0.54 release containing wrong code in request.py.
+
+0.54 (2012-06-18)
+-----------------
+
+  * Apache frontend: won't block sending slave informations to SlapOS Master
+    in case of problem from one slave instance.[Cedric de Saint Martin]
+  * Apache frontend will send IP informations for slaves in case slave is about
+    custom domain. [Cedric de Saint Martin]
+  * Ability to use LAMP applications without configuration. [Cedric de Saint
+    Martin]
+  * Users can specify custom domain in LAMP applications. [Cedric de Saint
+    Martin]
+
+0.53 (2012-06-07)
+-----------------
+
+  * Switch slaprunner into generic recipe, and add cloud9 recipe. [Cedric de
+    Saint Martin]
 
 0.52 (2012-05-16)
 -----------------

component/ca-certificates/buildout.cfg

 # CA certificates
 
 [buildout]
+
+extends =
+  ../patch/buildout.cfg
+
 parts =
   ca-certificates
 
@@ -14,8 +18,9 @@ download-only = true
 
 [ca-certificates]
 recipe = hexagonit.recipe.cmmi
-version = 20120212
+version = 20120623
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+patch-binary = ${patch:location}/bin/patch
 patches =
   ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
 patch-options = -p0

component/cloud9/buildout.cfg

@@ -14,6 +14,13 @@ parts =
 [cloud9]
 <= cloud9-git
 
+[node-sm]
+recipe = slapos.recipe.build:npm
+packages = sm
+node = nodejs
+environment =
+  PATH=${nodejs:location}/bin:%(PATH)s
+
 [cloud9-git]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -21,12 +28,13 @@ parts =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 97db1467c517d265438684bd2a70b0b76ee282f6
+commit = 9caeac82317bdf8e9942fd17676325234cfadac8
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
-npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
-command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+npm-binary = ${nodejs:location}/bin/node ${nodejs:location}/bin/npm
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin/:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
+command = ${:environment} (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
 update-command =
 
 [cloud9-npm]
@@ -36,10 +44,10 @@ update-command =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = slapos.recipe.npm
 # Node part has to be specified, otherwise system node is used.
-node = nodejs-0.6
+node = nodejs
 # List of packages to install
 packages =
-  cloud9
+  cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
   LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
\ No newline at end of file

component/git/buildout.cfg

@@ -6,25 +6,24 @@ extends =
   ../curl/buildout.cfg
   ../libexpat/buildout.cfg
   ../openssl/buildout.cfg
-  ../perl/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   git
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.8.4.tar.gz
-md5sum = e6c3319d76d52a830af395046fc56143
+url = http://git-core.googlecode.com/files/git-1.7.10.4.tar.gz
+md5sum = 68319d593d051ef76c26e945bbd2d7ac
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
   --with-zlib=${zlib:location}
   --with-expat=${libexpat:location}
-  --with-perl=${perl:location}/bin/perl
   --without-python
   --without-tcltk
 
 environment =
-  PATH=${curl:location}/bin:%(PATH)s
+  NO_PERL=y
+  PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib

component/mariadb/buildout.cfg

@@ -23,6 +23,13 @@ md5sum = d65f61829cfbcd5062f49db2b00bd6fe
 filename = mysql_create_system_tables__no_test.patch
 download-only = true
 
+[mariadb-handler_socket-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = be3bd5a5cc5fc56a398e6762494c8232
+filename = plugin_handler_socket_libhsclient_fatal.patch
+download-only = true
+
 [mariadb]
 recipe = hexagonit.recipe.cmmi
 version = 5.3.5-ga
@@ -57,6 +64,7 @@ configure-options =
 patch-options = -p0
 patches =
   ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
+  ${mariadb-handler_socket-patch:location}/${mariadb-handler_socket-patch:filename}
 environment =
   CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
   LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib

component/mariadb/plugin_handler_socket_libhsclient_fatal.patch

+# inspired by handlersocket-1.0.6-80-g88bf1e0-1.1-nmu.diff by gregoa@debian.org
+
+Description: add missing include to avoid FTBFS with gcc 4.7
+bug-debian: http://bugs.debian.org/667198
+More informations: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667198
+Author: gregor herrmann <gregoa@debian.org>
+
+--- plugin/handler_socket/libhsclient/fatal.cpp
++++ plugin/handler_socket/libhsclient/fatal.cpp
+@@ -9,6 +9,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <syslog.h>
++#include <unistd.h>
+
+ #include "fatal.hpp"

component/nodejs/buildout.cfg

@@ -12,12 +12,13 @@ parts =
 [nodejs]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.12/node-v0.6.12.tar.gz
-md5sum = a12766ae4003c9712927d1fa134ed9f6
+url = http://nodejs.org/dist/v0.6.19/node-v0.6.19.tar.gz
+md5sum = f5669a9717422b811c6bad1cc961b1e5
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
   PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include

component/openssl/buildout.cfg

@@ -7,6 +7,7 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   openssl
@@ -30,6 +31,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1.tar.gz
 md5sum = 134f168bc2a8333f19f81d684841710b
+patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
   ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}

component/pkgconfig/buildout.cfg

@@ -11,7 +11,7 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
+url = ftp://mirror.ovh.net/gentoo-distfiles/distfiles/pkg-config-0.26.tar.gz
 md5sum = 47525c26a9ba7ba14bf85e01509a7234
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config

component/slapos/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   slapos
@@ -47,7 +48,7 @@ allowed-eggs-from-site-packages =
 [environment]
 # Note: For now original PATH is appeneded to the end, as not all tools are
 #       provided by SlapOS
-PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:$PATH
+PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:$PATH
 CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
 LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -112,47 +113,53 @@ scripts =
   slapproxy = slapos.proxy:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006
 
-# Generated by buildout-versions
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.4
+docutils = 0.9.1
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+lxml = 2.3.5
 meld3 = 0.6.8
-netaddr = 0.7.6
-slapos.core = 0.25
+netaddr = 0.7.7
+slapos.core = 0.27
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.25
-Flask = 0.8
+# slapos.core==0.27
+Flask = 0.9
 
 # Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+# netaddr==0.7.7
+Sphinx = 1.1.3
 
 # Required by:
-# slapos.core==0.25
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.core==0.27
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.27
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-004
-# zope.interface==3.8.0
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.27
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.25
-zope.interface = 3.8.0
+# slapos.core==0.27
+zope.interface = 4.0.1

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = hexagonit.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz?download
-md5sum = 7e89f80c1822787c0831f7c0dbefcd7b
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
+md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
 configure-options =
   --enable-agent
   --enable-ipv6

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.53-dev'
+version = '0.60-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -49,6 +49,7 @@ setup(name=name,
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'cloud9 = slapos.recipe.cloud9:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
@@ -59,10 +60,10 @@ setup(name=name,
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'equeue = slapos.recipe.equeue:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
-          'generate_output_if_input_not_null = slapos.recipe.generate_output_if_input_not_null:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
+          'generate.password = slapos.recipe.generatepassword:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'generic.onetimeupload = slapos.recipe.generic_onetimeupload:Recipe',
+          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
           'firefox = slapos.recipe.firefox:Recipe',
@@ -108,6 +109,8 @@ setup(name=name,
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'slapmonitor = slapos.recipe.slapmonitor:Recipe',
+          'slapreport = slapos.recipe.slapreport:Recipe',
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'sphinx= slapos.recipe.sphinx:Recipe',
@@ -131,6 +134,7 @@ setup(name=name,
           'erp5.test = slapos.recipe.erp5_test:Recipe',
           'generic.varnish = slapos.recipe.generic_varnish:Recipe',
           'webchecker = slapos.recipe.web_checker:Recipe',
+          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/agent/__init__.py

@@ -34,76 +34,45 @@ from slapos.recipe.librecipe import GenericSlapRecipe
 import json
 import ConfigParser
 
+# XXX: BaseSlapRecipe and GenericSlapRecipe are deprecated, use
+# GenericBaseRecipe and move partition parameter fetching to software release.
 class Recipe(BaseSlapRecipe, GenericSlapRecipe):
   def install(self):
     self.path_list = []
-    self.crond = self.installCrond()
+    crond = self.installCrond()
 
     slap = slapos.slap.slap()
-    computer_id = self.computer_id
-    computer_partition_id = self.computer_partition_id
-    server_url = self.server_url
-    key_file = self.key_file
-    cert_file = self.cert_file
-    slap.initializeConnection(server_url, key_file, cert_file)
-    self.computer_partition = slap.registerComputerPartition(
-        computer_id, computer_partition_id)
-    self.parameter_dict = self.computer_partition.getInstanceParameterDict()
+    slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
+    parameter_dict = slap.registerComputerPartition(
+      self.computer_id,
+      self.computer_partition_id,
+    ).getInstanceParameterDict()
 
+    # XXX: should probably expect one more (SR-originating) parameter instead
+    # of using self.work_directory .
     configuration_path = os.path.join(self.work_directory, "agent.cfg")
-    configuration = ConfigParser.SafeConfigParser()
-    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"])
-    key_file.close()
-    configuration.set("agent", "key_file", key_filepath)
-    cert_filepath = os.path.join(self.work_directory, "cert")
-    cert_file = open(cert_filepath, "w")
-    cert_file.write(self.parameter_dict["cert"])
-    cert_file.close()
-    configuration.set("agent", "cert_file", cert_filepath)
-    configuration.set("agent", "maximum_software_installation_duration",
-        self.parameter_dict["maximum_software_installation_duration"])
-    configuration.set("agent", "software_live_duration",
-        self.parameter_dict["software_live_duration"])
-    configuration.set("agent", "computer_list",
-        self.parameter_dict["computer_list"])
-    configuration.set("agent", "software_list",
-        self.parameter_dict["software_list"])
-    configuration.set("agent", "log_directory", self.options["log_directory"])
-    configuration.set("agent", "state_file", self.options["state_file"])
-    state = open(self.options["state_file"], "w")
-    state.write('')
-    state.close()
-    configuration.add_section("software_uri")
-    software_list = json.loads(self.parameter_dict["software_list"])
-    for software in software_list:
-      configuration.set("software_uri", software, self.parameter_dict[software])
+    with open(configuration_path, "w") as configuration:
+      configuration.write(parameter_dict["configuration"])
+    agent_crond_path = os.path.join(crond, "agent")
+    with open(agent_crond_path, "w") as agent_crond:
+      agent_crond.write("*/5 * * * * %s -S %s --pidfile=%s --log=%s "
+        "%s 2>&1 > /dev/null\n" % (
+          self.options["python_binary"],
+          self.options["agent_binary"],
+          self.options["pidfile"],
+          self.options["log"],
+          configuration_path,
+      ))
 
-    configuration.write(open(configuration_path, "w"))
-
-    agent_crond_path = os.path.join(self.crond, "agent")
-    agent_crond = open(agent_crond_path, "w")
-    agent_crond.write("*/3 * * * * %s -S %s" % \
-      (self.options["python_binary"],
-        "%s --pidfile=%s %s" % \
-          (self.options["agent_binary"], self.options["pidfile"],
-            configuration_path)))
-    agent_crond.close()
-
-    return self.path_list + [configuration_path, key_filepath, cert_filepath, agent_crond_path]
+    return self.path_list + [configuration_path, agent_crond_path]
 
   def installCrond(self):
-    _, self.ws = self.egg.working_set()
+    _, ws = self.egg.working_set()
     timestamps = self.createDataDirectory('cronstamps')
     cron_output = os.path.join(self.log_directory, 'cron-output')
     self._createDirectory(cron_output)
     catcher = zc.buildout.easy_install.scripts([('catchcron',
-      __name__ + '.catdatefile', 'catdatefile')], self.ws, sys.executable,
+      __name__ + '.catdatefile', 'catdatefile')], ws, sys.executable,
       self.bin_directory, arguments=[cron_output])[0]
     self.path_list.append(catcher)
     cron_d = os.path.join(self.etc_directory, 'cron.d')
@@ -111,7 +80,7 @@ class Recipe(BaseSlapRecipe, GenericSlapRecipe):
     self._createDirectory(cron_d)
     self._createDirectory(crontabs)
     wrapper = zc.buildout.easy_install.scripts([('crond',
-      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+      'slapos.recipe.librecipe.execute', 'execute')], ws, sys.executable,
       self.wrapper_directory, arguments=[
         self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
         '-t', timestamps, '-f', '-l', '5', '-M', catcher]

slapos/recipe/apache_frontend/__init__.py

@@ -33,6 +33,7 @@ import zc.buildout
 import zc.recipe.egg
 import ConfigParser
 import re
+import traceback
 
 
 class Recipe(BaseSlapRecipe):
@@ -78,7 +79,7 @@ class Recipe(BaseSlapRecipe):
       # Future work may allow to choose between http and https (or both?)
       scheme = 'http://'
 
-      self.logger.info('processing slave instance: %s' % reference)
+      self.logger.info('Processing slave instance: %s' % reference)
 
       # Check for mandatory slave fields
       if backend_url is None:
@@ -88,8 +89,14 @@ class Recipe(BaseSlapRecipe):
 
       # Check for custom domain (like mypersonaldomain.com)
       # If no custom domain, use generated one.
-      domain = slave_instance.get('custom_domain', 
-          "%s.%s" % (reference.replace("-", "").lower(), frontend_domain_name))
+      # Note: if we get an empty custom_domain parameter, we ignore it
+      domain = slave_instance.get('custom_domain')
+      if isinstance(domain, basestring):
+        domain = domain.strip()
+      if domain is None or domain.strip() == '':
+        domain = "%s.%s" % (reference.replace("-", "").lower(),
+            frontend_domain_name)
+
       # Define the URL where the instance will be available
       # WARNING: we use default ports (443, 80) here.
       slave_dict[reference] = "%s%s/" % (scheme, domain)
@@ -149,13 +156,24 @@ class Recipe(BaseSlapRecipe):
 
     # Send connection informations about each slave
     for reference, url in slave_dict.iteritems():
-      self.setConnectionDict(dict(site_url=url), reference)
+      self.logger.debug("Sending connection parameters of slave "
+          "instance: %s" % reference)
+      try:
+        connection_dict = {
+           'frontend_ipv6_address': self.getGlobalIPv6Address(),
+           'frontend_ipv4_address': self.getLocalIPv4Address(),
+           'site_url': url
+        }
+        self.setConnectionDict(connection_dict, reference)
+      except:
+        self.logger.fatal("Error while sending slave %s informations: %s",
+            reference, traceback.format_exc())
 
     # Then set it for master instance
     self.setConnectionDict(
       dict(site_url=apache_parameter_dict["site_url"],
-           domain_ipv6_address=self.getGlobalIPv6Address(),
-           domain_ipv4_address=self.getLocalIPv4Address()))
+           frontend_ipv6_address=self.getGlobalIPv6Address(),
+           frontend_ipv4_address=self.getLocalIPv4Address()))
 
     # Promises
     promise_config = dict(

slapos/recipe/apachephp/__init__.py

@@ -85,6 +85,8 @@ class Recipe(GenericBaseRecipe):
       with open(secret_key_filename, 'r') as secret_key_file:
         secret_key = secret_key_file.read()
 
+    # Generate application configuration file
+    if self.options.get('template'):
       application_conf = dict(mysql_database=self.options['mysql-database'],
                               mysql_user=self.options['mysql-username'],
                               mysql_password=self.options['mysql-password'],

slapos/recipe/check_url_available/__init__.py

@@ -36,6 +36,7 @@ class Recipe(GenericBaseRecipe):
     config = {
       'url': self.options['url'],
       'shell_path': self.options['dash_path'],
+      'curl_path': self.options['curl_path'],
     }
 
     # XXX-Cedric in this script, curl won't check certificate

slapos/recipe/check_url_available/template/check_url.in

@@ -3,7 +3,7 @@
 # BEWARE: It will be overwritten automatically
 
 URL="%(url)s"
-CODE=$(curl -k -sL $URL -w %%{http_code} -o /dev/null)
+CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
 
 if [ $CODE -eq 000 ]; then
   echo "$URL is not available (server not reachable)" >&2

slapos/recipe/generate_output_if_input_not_null.py → slapos/recipe/cloud9/__init__.py

@@ -25,47 +25,36 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
+import os
 
 class Recipe(GenericBaseRecipe):
-  """Generate an output from one or several input and a template.
+  """Deploy a fully operational cloud9 service."""
 
-  Take "input-list" buildout parameter as input.
-  Each input of the list is separated by \n
-  Each input contains :
-    1/ The parameter to use (like mybuildoutpart:myparameter)
-    2/ The name of the input to use as key.
+  def _options(self, options):
+    self.ip = options['ip'].strip()
+    self.port = options['port'].strip()
+    self.git = options['git-binary'].strip()
+    self.node_executable = options['node-binary'].strip()
+    self.cloud9 = options['cloud9'].strip()
+    self.workdir = options['working-directory'].strip()
+    self.wrapper = options['wrapper'].strip()
+    # Set cloud9 access URL
+    options['access-url'] = 'http://[%s]:%s' % (self.ip, self.port)
 
-  If all parameters in input are found, create an "output" parameter from a
-  "template" parameter. The "template" parameter is just a string containing
-  python parameters (like %(mykey)s).
+  def install(self):
+    path_list = []
 
-  Will produce nothing if one element of "input_list" doesn't exist.
-  Will raise if any input reference non-existent buildout part.
+    environment = {
+        'PATH': os.path.dirname(self.git) + ':' + os.environ['PATH'],
+    }
 
-  Example : 
-  [get-output]
-  recipe = slapos.cookbook:generate_output_if_input_not_null
-  input-list =
-    firstkey mybuildoutpart:myparameter
-    otherkey myotherbuildoutpart:myotherparameter
-  template = I want to get %(key)s and %(otherkey)s
+    cloud9_args = [self.node_executable, self.cloud9, '-l', self.ip, '-p',
+        self.port, '-w', self.workdir]
 
-  This example will produce an "output" parameter if myparameter and
-  myotherparameter are defined.
-  """
-  def __init__(self, buildout, name, options):
-    # Get all inputs
-    input_dict = {}
-    for line in options['input-list'].strip().split('\n'):
-      key, buildout_parameter = line.split(' ')
-      buildout_part, parameter_name = buildout_parameter.split(':')
-      parameter_value = buildout[buildout_part].get(parameter_name)
-      # If any parameter is not defined, don't do anything
-      if not parameter_value:
-        return
-      input_dict[key] = parameter_value
-    # Generate output
-    options['output'] = options['template'] % input_dict
+    wrapper = self.createPythonScript(self.wrapper,
+        'slapos.recipe.librecipe.execute.executee',
+        (cloud9_args, environment)
+    )
+    path_list.append(wrapper)
 
-  def install(self):
-    return []
+    return path_list

slapos/recipe/generatemac.py

-
 ##############################################################################
 #
 # Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
@@ -26,15 +25,26 @@
 #
 ##############################################################################
 import random
+import os
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
 
   def __init__(self, buildout, name, options):
+    if os.path.exists(options['storage-path']):
+      open_file = open(options['storage-path'], 'r')
+      options['mac-address'] = open_file.read()
+      open_file.close()
+
+    if options.get('mac-address', '') == '':
       # First octet has to represent a locally administered address
       octet_list = [254] + [random.randint(0x00, 0xff) for x in range(5)]
       options['mac-address'] = ':'.join(['%02x' % x for x in octet_list])
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):
-    return []
+    open_file = open(self.options['storage-path'], 'w')
+    open_file.write(self.options['mac-address'])
+    open_file.close()
+    return [self.options['storage-path']]

slapos/recipe/generatepassword.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import random
+import os
+import binascii
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def __init__(self, buildout, name, options):
+    if os.path.exists(options['storage-path']):
+      open_file = open(options['storage-path'], 'r')
+      options['passwd'] = open_file.read()
+      open_file.close()
+
+    if options.get('passwd', '') == '':
+      options['passwd'] = binascii.hexlify(os.urandom(
+                            int(options.get('bytes', '24'))))
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    open_file = open(self.options['storage-path'], 'w')
+    open_file.write(self.options['passwd'])
+    open_file.close()
+    return [self.options['storage-path']]

slapos/recipe/kvm/__init__.py

@@ -25,7 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
 import os
 import sys
 
@@ -33,11 +32,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['passwd'] = binascii.hexlify(os.urandom(4))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       tap_interface=self.options['tap'],

slapos/recipe/kvm/template/kvm_run.in

@@ -32,7 +32,7 @@ if not os.path.exists(disk_path):
   subprocess.Popen(['%(qemu_img_path)s', 'create' ,'-f', 'qcow2',
       '%(disk_path)s', '%(disk_size)sG'])
 
-kvm_argument_list = ['kvm', '-net', 'nic,macaddr=%(mac_address)s',
+kvm_argument_list = ['%(qemu_path)s', '-enable-kvm', '-net', 'nic,macaddr=%(mac_address)s',
   '-net', 'tap,ifname=%(tap_interface)s,script=no,downscript=no',
   '-smp', '%(smp_count)s',
   '-m', '%(ram_size)s',

slapos/recipe/generic_onetimeupload/__init__.py → slapos/recipe/onetimeupload/__init__.py

@@ -33,11 +33,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['key'] = binascii.hexlify(os.urandom(24))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       ip=self.options['ip'],

slapos/recipe/request.py

@@ -36,6 +36,7 @@ class Recipe(object):
     slap = slapmodule.slap()
 
     self.software_release_url = options['software-url']
+    self.name = options['name']
 
     slap.initializeConnection(options['server-url'],
                               options.get('key-file'),
@@ -73,7 +74,7 @@ class Recipe(object):
             options['config-%s' % config_parameter]
 
     self.instance = self.request(options['software-url'], software_type,
-      options['name'], partition_parameter_kw=partition_parameter_kw,
+      self.name, partition_parameter_kw=partition_parameter_kw,
       filter_kw=filter_kw, shared=self.isSlave)
 
     self.failed = None
@@ -92,13 +93,14 @@ class Recipe(object):
       try:
         status = self.instance.getState()
       except slapmodule.NotFoundError:
-        status = "not ready yet, please try again"
-      # XXX-Cedric : currently raise an error. So swallow it...
+        status = 'not ready yet, please try again'
       except AttributeError:
-        status = "unknown"
-      self.logger.error("Connection parameter %s not found. "
-          "Status of requested instance is : %s." % (self.failed, status))
-      raise KeyError("Connection parameter %s not found. " % self.failed)
+        status = 'unknown'
+      error_message = 'Connection parameter %s not found. '\
+          'Requested instance is currently %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
+      self.logger.error(error_message)
+      raise KeyError(error_message)
     return []
 
   update = install

slapos/recipe/signal_wrapper.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['wrapper-path'],
+        'slapos.recipe.librecipe.execute.execute_with_signal_translation',
+        [self.options['wrapped-path']]
+      )
+    ]

slapos/recipe/slapmonitor/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
+
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      database_path=self.options['database-path'],
+      slapmonitor_path = self.options['slapmonitor-path'],
+      shell_path=self.options['shell-path'],
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapmonitor_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapmonitor/template/slapmonitor_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapmonitor_path)s %(pid_file_path)s %(database_path)s
+

slapos/recipe/slapreport/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
+
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      consumption_log_path=self.options['consumption-log-path'],
+      database_path=self.options['database-path'],
+      slapreport_path = self.options['slapreport-path'],
+      logbox_ip = self.options['logbox-ip'],
+      logbox_port = self.options['logbox-port'],
+      logbox_user = self.options['logbox-user'],
+      logbox_passwd = self.options['logbox-passwd'],
+      shell_path=self.options['shell-path'],
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapreport_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapreport/template/slapreport_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passwd)s

slapos/recipe/slaprunner/__init__.py

@@ -24,74 +24,71 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
 import os
-import pkg_resources
-import sys
-import zc.buildout
-import zc.recipe.egg
 
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    self.ipv4 = options['ipv4'].strip()
+    self.ipv6 = options['ipv6'].strip()
+    self.proxy_port = options['proxy_port'].strip()
+    self.runner_port = options['runner_port'].strip()
+    self.workdir = options['working-directory'].strip()
+    self.software_directory = options['software-directory'].strip()
+    self.instance_directory = options['instance-directory'].strip()
+    self.partition_amount = options['partition-amount'].strip()
+    self.cloud9_url = options['cloud9-url'].strip()
+    # Set slaprunner access URL
+    options['access-url'] = 'http://[%s]:%s' % (self.ipv6, self.runner_port)
+
+  def install(self):
+    path_list = []
 
-class Recipe(BaseSlapRecipe):
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
-    ipv4 = self.getLocalIPv4Address()
-    ipv6 = self.getGlobalIPv6Address()
-    proxy_port = '50000'
-    runner_port = '50000'
-    cloud9_port = '30000'
-    workdir = self.createDataDirectory('runner')
-    software_root = os.path.join(workdir, 'software')
-    instance_root = os.path.join(workdir, 'instance')
     configuration = dict(
-        software_root=software_root,
-        instance_root=instance_root,
-        master_url='http://%s:%s/' % (ipv4, proxy_port),
+        software_root=self.software_directory,
+        instance_root=self.instance_directory,
+        master_url='http://%s:%s/' % (self.ipv4, self.proxy_port),
         computer_id='slaprunner',
-        partition_amount=7,
+        partition_amount=self.partition_amount,
         slapgrid_sr=self.options['slapgrid_sr'],
         slapgrid_cp=self.options['slapgrid_cp'],
         slapproxy=self.options['slapproxy'],
         supervisor=self.options['supervisor'],
-        supervisord_config=os.path.join(instance_root, 'etc',
+        supervisord_config=os.path.join(self.instance_directory, 'etc',
           'supervisord.conf'),
-        runner_workdir=workdir,
-        runner_host=ipv6,
-        runner_port=runner_port,
-        ipv4_address=ipv4,
-        ipv6_address=ipv6,
-        proxy_host=ipv4,
-        proxy_port=proxy_port,
-        proxy_database=os.path.join(workdir, 'proxy.db'),
-	git=self.options['git'],
-	cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port),
+        runner_workdir=self.workdir,
+        etc=self.etc,
+        runner_host=self.ipv6,
+        runner_port=self.runner_port,
+        ipv4_address=self.ipv4,
+        ipv6_address=self.ipv6,
+        proxy_host=self.ipv4,
+        proxy_port=self.proxy_port,
+        proxy_database=os.path.join(self.workdir, 'proxy.db'),
+        git=self.options['git-binary'],
         ssh_client=self.options['ssh_client'],
         public_key=self.options['public_key'],
         private_key=self.options['private_key'],
-
+        cloud9_url=self.cloud9_url
     )
-    config_file = self.createConfigurationFile('slapos.cfg',
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
-          'template/slapos.cfg.in'), configuration))
-    self.path_list.append(config_file)
+    
+    config_file = self.createFile(self.options['slapos.cfg'],
+        self.substituteTemplate(self.getTemplateFilename('slapos.cfg.in'),
+        configuration))
+    path_list.append(config_file)
 
     environment = dict(
-        PATH=os.path.dirname(self.options['git']) + ':' + os.environ['PATH'],
+        PATH=os.path.dirname(self.options['git-binary']) + ':' + os.environ['PATH'],
         GIT_SSH=self.options['ssh_client']
     )
-    workdir = os.path.join(workdir, 'project')
-    if not os.path.exists(workdir):
-      os.mkdir(workdir)
+
     launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
-    cloud9_args = [self.options['node-bin'].strip(), self.options['cloud9'].strip(),
-                   '-l', ipv6, '-p', cloud9_port, '-w', workdir]
-    self.path_list.extend(zc.buildout.easy_install.scripts([('slaprunner',
-      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[launch_args, environment]))
-    self.path_list.extend(zc.buildout.easy_install.scripts([('cloud9IDE',
-      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[cloud9_args, environment]))
-    self.setConnectionDict(dict(slaprunner_url='http://[%s]:%s' % (ipv6, runner_port),
-                            cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port)))
-    return self.path_list
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.executee',
+        (launch_args, environment)
+    )
+    path_list.append(wrapper)
+
+    return path_list

slapos/recipe/slaprunner/template/slapos.cfg.in

@@ -3,6 +3,7 @@ software_root = %(software_root)s
 instance_root = %(instance_root)s
 master_url = %(master_url)s
 computer_id = %(computer_id)s
+maximal_delay = 0
 
 [slapformat]
 partition_amount = %(partition_amount)s

slapos/recipe/zabbixagent/__init__.py

@@ -124,5 +124,6 @@ class Recipe(BaseSlapRecipe):
                                                   self.parameter_dict['hostname'],
                                                   self.parameter_dict['server'])
     self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'],
-      name=zabbix_agentd_conf['hostname'], port=zabbix_agentd_conf['port']))
+      name=zabbix_agentd_conf['hostname'],
+      port=str(zabbix_agentd_conf['port'])))
     return self.path_list

slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in

@@ -229,5 +229,13 @@ ListenIP=%(ip)s
 # Mandatory: no
 # Default:
 # UserParameter=
+UserParameter=custom_sensor.temp1,sensors | grep "temp1" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.temp2,sensors | grep "temp2" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core0,sensors | grep "Core 0" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core1,sensors | grep "Core 1" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core2,sensors | grep "Core 2" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core3,sensors | grep "Core 3" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.fan1,sensors | grep "fan1" | sed -e "s/.*  //" | sed -e "s/ .*//"
+UserParameter=custom_sensor.fan2,sensors | grep "fan2" | sed -e "s/.*  //" | sed -e "s/ .*//"
 
 %(user_parameter_string)s

software/agent/README.testing_agent.txt

+testing agent
+=============
+
+Testing agent simulates a normal user interacting with vifib master. It requests software release installation or software instance instiaction randomly from time to time. SlapOS clients then run these commands remotely. It is the testing agent determining whether an error occurs.
+
+Usage
+=====
+Request a testing agent instance from vifib with following parameters:
+<?xml version='1.0' encoding='utf-8'?>
+<instance>
+<parameter id="configuration">[DEFAULT]
+# ConfigParser's magic section.
+computer_list = ["COMP-607"]
+master_url = https://slap.vifib.com/
+# Note that certificates are now literally in the configuration, meaning
+# you may decide to specify different ones for each test. Likewise for
+# master_url.
+key = -----BEGIN PRIVATE KEY-----
+  MII[...]
+  [...]
+  -----END PRIVATE KEY-----
+cert = -----BEGIN CERTIFICATE-----
+  MII[...]
+  [...]
+  -----END CERTIFICATE-----
+
+[agent]
+# This section is special: it contains configuration.
+# Does not make use of values coming from [DEFAULT] (well, it
+# necessarily contains them, but they are not used).
+node_title = ...
+test_title = ...
+project_title = ...
+task_count = 2 # Number of tests to run concurrently
+report_url = # report_url, find details in erp5 for details
+
+# All other sections are individual tests, whatever they are named.
+[test-apache]
+# Software release URL
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+# Optional request_kw parameters: if not provided, will only test SR
+# build. Depending on your slap version, it may be required to provide
+# a "software_type" parameter, even if you want the default type.
+request_kw = {
+    "filter_kw": {"computer_guid": "..."},
+    "partition_parameter_kw": {
+      "domain": "example.com"
+    }
+  }
+# All are in seconds.
+max_install_duration = 3000
+max_uninstall_duration = 360
+max_request_duration = 700
+max_destroy_duration = 360
+
+[impossible-apache]
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+max_install_duration = 1
+max_uninstall_duration = 1
+
+[impossible-apache-2]
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+max_install_duration = 660
+max_uninstall_duration = 1
+</parameter>
+</instance>
+

software/agent/instance.cfg

 [buildout]
 parts =
-  rootdirectory
   instance
 
 eggs-directory = ${buildout:eggs-directory}
@@ -9,17 +8,16 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 agent_binary = ${buildout:directory}/bin/agent
+report_start = ${buildout:directory}/bin/report_start
+report_stop = ${buildout:directory}/bin/report_stop
 dcrond_binary = ${dcron:location}/sbin/crond
 python_binary = ${python2.7:location}/bin/python
-pidfile = $${buildout:directory}/agent.pid
-log_directory = $${buildout:directory}/var/log
-state_file = $${buildout:directory}/state.cfg
+pidfile = $${rootdirectory:run}/agent.pid
+log = $${rootdirectory:agentlog}/agent.log
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-run = $${rootdirectory:etc}/run/
-var = $${buildout:directory}/var/
-log = $${rootdirectory:var}/log/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
+run = $${buildout:directory}/etc/run
+agentlog = $${buildout:directory}/var/log/agent
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin

software/agent/software.cfg

 [buildout]
-
-# develop =
-#   /opt/slapdev
-#   /opt/slapos.toolbox
-
 extends =
   ../../component/dcron/buildout.cfg
   ../../component/python-2.7/buildout.cfg
@@ -31,7 +26,7 @@ eggs = ${instance-recipe:egg}
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-md5sum = 2e1a7a68b18de68b163e98a5f92cc776
+md5sum = c7cb98594f394d05baedabe424643f6f
 mode = 0644
 
 [eggs]
@@ -41,6 +36,7 @@ eggs =
   ${lxml-python:egg}
   slapos.cookbook
   slapos.toolbox
+  erp5.util
 
 [lxml-python]
 python = python2.7
@@ -53,7 +49,7 @@ eggs =
   ${lxml-python:egg}
   slapos.core
   slapos.cookbook
-  slapos.toolbox
+  slapos.toolbox[agent]
 
 [networkcache]
 # signature certificates of the following uploaders.

software/drupal/instance.cfg

-[buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/drupal/software.cfg

 [buildout]
-versions = versions
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
 
 extends =
-  ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
+  ../../stack/lamp/buildout.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz
-md5sum = e0226b56e8d5c57c6b126e8ed5866b1f
-  
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+url = http://ftp.drupal.org/files/projects/drupal-7.14.tar.gz
+md5sum = af7abd95c03ecad4e1567ed94a438334
+
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/settings.php.in
+md5sum = add9e4e96094a9d3fb7cf0f4d26ae544
+download-only = True
+filename = template.in
 mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-Jinja2 = 2.6
-MySQL-python = 1.2.3
-Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
-plone.recipe.command = 1.1
-slapos.cookbook = 0.34
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-slapos.toolbox = 0.10
-
-# Required by:
-# slapos.core==0.18
-# slapos.toolbox==0.10
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.34
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-# xml-marshaller==0.9.7
-lxml = 2.3.1
-
-# Required by:
-# slapos.cookbook==0.34
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.18
-netifaces = 0.5
-
-# Required by:
-# slapos.toolbox==0.10
-paramiko = 1.7.7.1
-
-# Required by:
-# slapos.toolbox==0.10
-psutil = 0.3.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-slapos.core = 0.18
-
-# Required by:
-# slapos.core==0.18
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.34
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.18
-zope.interface = 3.8.0
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
+[application-configuration]
+location = sites/default/default.settings.php

software/kvm/instance-frontend.cfg

@@ -12,7 +12,6 @@ parts =
   ca-frontend
   certificate-authority
   frontend-promise
-  publish-kvm-frontend-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -48,7 +47,7 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d
 recipe = slapos.cookbook:kvm.frontend
 domain = $${ca-frontend:name}
 # port = $${slap-parameter:port}
-ip = $${slap-network-information:global-ipv6}
+ip = $${slap-network-information:local-ipv4}
 port = $${slap-parameter:port}
 http-redirection = $${slap-parameter:http-redirection}
 ssl-key-path = $${ca-frontend:key-file}
@@ -130,11 +129,6 @@ logrotate-entries = $${directory:logrotate-entries}
 backup = $${directory:logrotate-backup}
 state-file = $${rootdirectory:srv}/logrotate.status
 
-[publish-kvm-frontend-connection-information]
-recipe = slapos.cookbook:publish
-ip = $${frontend-instance:ip}
-port = $${frontend-instance:port}
-
 [slap-parameter]
 # Default value if no port is specified
 port = 4443

software/kvm/instance-kvm.cfg

@@ -5,12 +5,13 @@
 #############################
 [buildout]
 parts =
-  request-slave-frontend
   certificate-authority
+  publish-kvm-backend-connection-information
+  publish-kvm-frontend-connection-information
   kvm-promise
+  websockify-sighandler
   novnc-promise
   frontend-promise
-  publish-kvm-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -33,6 +34,12 @@ ca-dir = $${rootdirectory:srv}/ssl
 
 [create-mac]
 recipe = slapos.cookbook:generate.mac
+storage-path = $${rootdirectory:srv}/mac
+
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/passwd
+bytes = 4
 
 [kvm-instance]
 recipe = slapos.cookbook:kvm
@@ -53,6 +60,7 @@ controller-path = $${basedirectory:services}/kvm_controller
 shell-path = ${dash:location}/bin/dash
 qemu-path = ${kvm:location}/bin/qemu-system-x86_64
 qemu-img-path = ${kvm:location}/bin/qemu-img
+passwd = $${gen-passwd:passwd}
 
 [kvm-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -73,6 +81,11 @@ websockify-path = ${buildout:directory}/bin/websockify
 ssl-key-path = $${ca-novnc:key-file}
 ssl-cert-path = $${ca-novnc:cert-file}
 
+[websockify-sighandler]
+recipe = slapos.cookbook:signalwrapper
+wrapper-path = $${basedirectory:services}/websockify
+wrapped-path = $${novnc-instance:path}
+
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl
@@ -98,7 +111,7 @@ recipe = slapos.cookbook:certificate_authority.request
 key-file = $${basedirectory:novnc-conf}/novnc.key
 cert-file = $${basedirectory:novnc-conf}/novnc.crt
 executable = $${rootdirectory:bin}/novnc
-wrapper = $${basedirectory:services}/websockify
+wrapper = $${rootdirectory:bin}/websockify
 
 [novnc-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -114,41 +127,34 @@ db-path = $${rootdirectory:srv}/slapmonitor_database
 
 [request-slave-frontend]
 recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
+software-url = $${slap-parameter:frontend-software-url}
 server-url = $${slap-connection:server-url}
 key-file = $${slap-connection:key-file}
 cert-file = $${slap-connection:cert-file}
 computer-id = $${slap-connection:computer-id}
 partition-id = $${slap-connection:partition-id}
 name = SlaveFrontend
-software-type = frontend
+software-type = $${slap-parameter:frontend-software-type}
 slave = true
 config = host port
 config-host = $${novnc-instance:ip}
 config-port = $${novnc-instance:port}
 return = url resource port domainname
+sla = instance_guid
+sla-instance_guid = $${slap-parameter:frontend-instance-guid}
+
+[publish-kvm-backend-connection-information]
+recipe = slapos.cookbook:publish
+backend_url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1
+password = $${kvm-instance:passwd}
 
-# Will generate, if existing, URL to reach KVM using frontend
-[get-slave-connection-url]
-recipe = slapos.cookbook:generate_output_if_input_not_null
-input-list =
-  frontend-url request-slave-frontend:connection-url
-  frontend-port request-slave-frontend:connection-port
-  frontend-resource request-slave-frontend:connection-resource
-  frontend-domainname request-slave-frontend:connection-domainname
-template = %(frontend-url)s/vnc_auto.html?host=%(frontend-domainname)s&port=%(frontend-port)s&encrypt=1&path=%(frontend-resource)s
-# This is default output, if slave is not ready yet
-output = Not ready yet. Please use backend URL if possible or wait a few minutes.
+[publish-kvm-frontend-connection-information]
+<= publish-kvm-backend-connection-information
+url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}
 
 [frontend-promise]
 recipe = slapos.cookbook:check_url_available
 path = $${basedirectory:promises}/frontend_promise
-url = $${get-slave-connection-url:output}
+url = $${publish-kvm-frontend-connection-information:url}
 dash_path = ${dash:location}/bin/dash
-
-
-[publish-kvm-connection-information]
-recipe = slapos.cookbook:publish
-backend_url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1
-url = $${get-slave-connection-url:output}
-password = $${kvm-instance:passwd}
+curl_path = ${curl:location}/bin/curl

software/kvm/instance-nbd.cfg

@@ -40,8 +40,13 @@ path = $${basedirectory:promises}/nbd_promise
 hostname = $${nbd-instance:ip}
 port = $${nbd-instance:port}
 
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/passwd
+bytes = 24
+
 [onetimeupload-instance]
-recipe = slapos.cookbook:generic.onetimeupload
+recipe = slapos.cookbook:onetimeupload
 ip = $${slap-network-information:global-ipv6}
 port = 9999
 image-path = $${rootdirectory:srv}/cdrom.iso
@@ -49,6 +54,7 @@ log-path = $${rootdirectory:log}/onetimeupload.log
 shell-path = ${dash:location}/bin/dash
 onetimeupload-path = ${buildout:bin-directory}/onetimeupload
 path = $${basedirectory:services}/onetimeupload
+key = $${gen-passwd:passwd}
 
 [onetimeupload-promise]
 recipe = slapos.cookbook:check_port_listening

software/kvm/software.cfg

@@ -14,6 +14,7 @@ extends =
   ../../component/openssl/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/lxml-python/buildout.cfg
+  ../../component/curl/buildout.cfg
   ../../stack/nodejs.cfg
 
 develop =
@@ -104,14 +105,14 @@ eggs =
 # https://github.com/nodejitsu/node-http-proxy
 recipe = slapos.recipe.build:download-unpacked
 #XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/master
+url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/20120621
 md5sum = 20204d0b29c2cef26e1c91e99eedca6b
 
 [proxy-by-url]
 # https://github.com/dominictarr/proxy-by-url
 recipe = slapos.recipe.build:download-unpacked
 #XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/master
+url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/20120621
 md5sum = c2609948aa708581f93b981b23880314
 
 [npm-modules]
@@ -132,7 +133,7 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg
-md5sum = 8d67a6cabe4fbce2bd44aa006a0d0cf8
+md5sum = c0f24f40e3c55a30fb584c40e81956da
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
@@ -146,14 +147,14 @@ mode = 0644
 [template-nbd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nbd.cfg
-md5sum = 7691fadfc8d4392c58ac1bf0ebd5aaf2
+md5sum = 692b3da84473fbc962bea9b371b5355b
 output = ${buildout:directory}/template-nbd.cfg
 mode = 0644
 
 [template-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-frontend.cfg
-md5sum = 123bf4e5bea9e86c03b62e9afb8ca04b
+md5sum = 73359b52013b1b65f75005e8698ed180
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
 
@@ -208,7 +209,7 @@ lxml = 2.3.4
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 pycrypto = 2.5
-slapos.cookbook = 0.48
+slapos.cookbook = 0.57
 slapos.recipe.build = 0.7
 slapos.recipe.template = 2.3
 slapos.toolbox = 0.24
@@ -225,7 +226,7 @@ Flask = 0.8
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 PyXML = 0.8.4
 
 # Required by:
@@ -237,11 +238,11 @@ atomize = 0.1.1
 feedparser = 5.1.1
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 netaddr = 0.7.6
 
 # Required by:
@@ -261,13 +262,13 @@ paramiko = 1.7.7.1
 psutil = 0.4.1
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 # slapos.core==0.24
 # slapos.toolbox==0.24
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 # slapos.toolbox==0.24
 slapos.core = 0.24
 
@@ -276,14 +277,16 @@ slapos.core = 0.24
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 # slapos.toolbox==0.24
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.48
+# slapos.cookbook==0.57
 zc.recipe.egg = 1.3.2
 
 # Required by:
 # slapos.core==0.24
 zope.interface = 3.8.0
+
+websockify = 0.1-dev

software/lamp-template/instance.cfg

-[buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
-
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/lamp-template/software.cfg

 [buildout]
-versions = versions
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
 
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -28,20 +20,3 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
 location = Student shall put here relative path to application top level directory where configuration shall be created
-
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = 
-  ${instance-recipe:egg}

software/slaprunner/README.txt

+kvm
+===
+
+Introduction
+------------
+
+This software release is used to deploy Slaprunner instances.
+Slaprunner is an all-in-one IDE used to develop and test profiles and recipes for SlapOS.
+
+Parameters
+----------
+
+authorized-key
+~~~~~~~~~~~~~~
+
+You need to specify your SSH public key in order to connect to the SSH server of this instance.
+
+Example of parameter XML::
+
+  <?xml version="1.0" encoding="utf-8"?>
+  <instance>
+  <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
+  </instance>

software/slaprunner/instance-runner.cfg

+[buildout]
+parts =
+  cloud9
+  slaprunner
+  sshkeys-dropbear
+  dropbear-server-add-authorized-key
+  sshkeys-authority
+  publish-connection-informations
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+
+# Create all needed directories
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sshkeys = $${rootdirectory:srv}/sshkeys
+services = $${rootdirectory:etc}/run/
+ssh = $${rootdirectory:etc}/ssh/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[runnerdirectory]
+recipe = slapos.cookbook:mkdirectory
+home = $${rootdirectory:srv}/runner/
+project = $${:home}/project
+software-root = $${:home}/software
+instance-root = $${:home}/instance
+
+#Create password for slaprunner
+[slapunner-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:etc}/.passwd
+bytes = 4
+
+# Deploy cloud9 and slaprunner
+[cloud9]
+recipe = slapos.cookbook:cloud9
+ip = $${slap-network-information:global-ipv6}
+port = 30000
+wrapper = $${basedirectory:services}/cloud9
+working-directory = $${runnerdirectory:home}
+git-binary = ${git:location}/bin/git
+node-binary = ${nodejs:location}/bin/node
+cloud9 = ${cloud9:location}/server.js
+
+[slaprunner]
+recipe = slapos.cookbook:slaprunner
+slaprunner = ${buildout:directory}/bin/slaprunner
+slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
+slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
+slapproxy = ${buildout:directory}/bin/slapproxy
+supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
+git-binary = ${git:location}/bin/git
+slapos.cfg = $${rootdirectory:etc}/slapos.cfg
+working-directory = $${runnerdirectory:home}
+project-directory = $${runnerdirectory:project}
+software-directory = $${runnerdirectory:software-root}
+instance-directory = $${runnerdirectory:instance-root}
+etc = $${rootdirectory:etc}
+ssh_client = $${sshkeys-dropbear:wrapper}
+public_key = $${sshkeys-dropbear:public-key}
+private_key = $${sshkeys-dropbear:private-key}
+ipv4 = $${slap-network-information:local-ipv4}
+ipv6 = $${slap-network-information:global-ipv6}
+proxy_port = 50000
+runner_port = 50000
+partition-amount = 7
+cloud9-url = $${cloud9:access-url}
+wrapper = $${basedirectory:services}/slaprunner
+
+# Deploy dropbear (minimalist ssh server)
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${basedirectory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${directory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = /bin/bash
+rsa-keyfile = $${directory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-server:wrapper}
+public-key = $${dropbear-server:rsa-keyfile}.pub
+private-key = $${dropbear-server:rsa-keyfile}
+wrapper = $${basedirectory:services}/sshd
+
+[dropbear-server-add-authorized-key]
+<= dropbear-server
+recipe = slapos.cookbook:dropbear.add_authorized_key
+key = $${slap-parameter:authorized-key}
+
+
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url
+config-url = $${slaprunner:access-url}
+return = site_url
+
+
+# Send informations to SlapOS Master
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = $${slaprunner:access-url}
+url =  $${request-frontend:connection-site_url}
+cloud9_url = $${cloud9:access-url}
+ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
+passwd = $${slapunner-passwd:passwd}
+
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =

software/slaprunner/instance.cfg

 [buildout]
 parts =
-  instance
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-client
+  switch_softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-runner:output}
\ No newline at end of file
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
-slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
-git = ${git:location}/bin/git
-node-bin = ${nodejs-0.4:location}/bin/node
-cloud9 = ${cloud9:location}/bin/cloud9.js
-ssh_client = $${sshkeys-dropbear:wrapper}
-public_key = $${sshkeys-dropbear:public-key}
-private_key = $${sshkeys-dropbear:private-key}
-
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests/
-keys = $${directory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${directory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-client:wrapper}
-public-key = $${dropbear-client:identity-file}.pub
-private-key = $${dropbear-client:identity-file}
-wrapper = $${rootdirectory:bin}/dbclient
-
-[dropbear-client]
-recipe = slapos.cookbook:dropbear.client
-dbclient-binary = ${dropbear:location}/bin/dbclient
-identity-file = $${directory:ssh}/id_rsa
-wrapper = $${rootdirectory:bin}/dbclient_raw
-home = $${rootdirectory:etc}/ssh/
-force-host-key = True
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sshkeys = $${rootdirectory:srv}/sshkeys
-services = $${rootdirectory:etc}/run/
-ssh = $${rootdirectory:etc}/ssh/
\ No newline at end of file

software/slaprunner/software.cfg

 [buildout]
-
-extensions =
-  buildout-versions
-
 extends =
   ../../stack/slapos.cfg
   ../../stack/flask.cfg
@@ -13,30 +9,26 @@ extends =
 
 parts =
   template
+  slapos-cookbook
   eggs
-  instance-recipe-egg
-  dropbear
-
-versions = versions
-
-[instance-recipe]
-egg = slapos.cookbook
-module = slaprunner
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 7cfd248cdc6fa6cbb4957d25a0aed884
+md5sum = 5307e4200f044ae57b504ad68444491c
+
+[template-runner]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-runner.cfg
+output = ${buildout:directory}/template-runner.cfg
+md5sum = 9c7daf59883c4c330064632fdaf329fa
+mode = 0644
 
 [eggs]
-eggs +=
+recipe = z3c.recipe.scripts
+eggs =
   slapos.libnetworkcache
   slapos.toolbox
   slapos.core
@@ -60,98 +52,93 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
-apache-libcloud = 0.8.0
+apache-libcloud = 0.10.1
 async = 0.6.1
 buildout-versions = 1.7
+docutils = 0.9.1
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+lxml = 2.3.4
 meld3 = 0.6.8
+netaddr = 0.7.7
 plone.recipe.command = 1.1
-pycrypto = 2.5
-slapos.cookbook = 0.45
+pycrypto = 2.6
+slapos.cookbook = 0.58
+slapos.core = 0.26.2
 slapos.libnetworkcache = 0.12
-slapos.recipe.template = 2.3
-slapos.toolbox = 0.20
+slapos.recipe.build = 0.9
+slapos.recipe.template = 2.4
+slapos.toolbox = 0.26.1
 smmap = 0.8.2
+xml-marshaller = 0.9.7
+z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.24
-Flask = 0.8
+# slapos.core==0.26.2
+# slapos.toolbox==0.26.1
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.20
-GitPython = 0.3.2.RC1
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.45
-PyXML = 0.8.4
+# slapos.toolbox==0.26.1
+GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.20
-atomize = 0.1.1
+# slapos.cookbook==0.58
+PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.20
-feedparser = 5.1.1
+# netaddr==0.7.7
+Sphinx = 1.1.3
 
 # Required by:
-# slapos.cookbook==0.45
-inotifyx = 0.2.0
+# slapos.toolbox==0.26.1
+atomize = 0.1.1
 
 # Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
-# xml-marshaller==0.9.7
-lxml = 2.3.4
+# slapos.toolbox==0.26.1
+feedparser = 5.1.2
 
 # Required by:
-# slapos.cookbook==0.45
-netaddr = 0.7.6
+# slapos.cookbook==0.58
+inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.26.2
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.20
-paramiko = 1.7.7.1
+# slapos.toolbox==0.26.1
+paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.20
-psutil = 0.4.1
+# slapos.toolbox==0.26.1
+psutil = 0.5.1
 
 # Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
+# slapos.cookbook==0.58
+# slapos.core==0.26.2
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.20
+# slapos.toolbox==0.26.1
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-# zope.interface==3.8.0
+# zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.45
-slapos.core = 0.24
-
-# Required by:
-# slapos.core==0.24
+# slapos.core==0.26.2
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.45
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.45
+# slapos.cookbook==0.58
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 3.8.0
+# slapos.core==0.26.2
+zope.interface = 4.0.1
\ No newline at end of file

stack/flask.cfg

 # Stack for Flask microframework: http://flask.pocoo.org/
 [buildout]
 extends =
-  ../component/python-2.7/buildout.cfg
-  ../component/lxml-python/buildout.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
+  slapos.cfg
 
 parts =
-  eggs
-
-# Unzip, as Flask can have a lot of troubles with zipped eggs
-unzip = true
+  slapos-cookbook
+  flask-egg
 
-[eggs]
-python = python2.7
+[flask-egg]
 recipe = zc.recipe.egg
 eggs =
-  ${lxml-python:egg}
   Flask
-  slapos.cookbook
-
-[lxml-python]
-python = python2.7

stack/lamp.cfg

+# Warning: this file is deprecated and is here only for compatiblity.
+# If you extend this file, you should probably extend stack/lamp/buildout.cfg
+# Instead.
+
+# Only reason to use this file is when your PHP application uses "delete",
+# "rename" or any feature of lampconfigure (not yet ported to new stack).
+
 [buildout]
 parts =
   template
@@ -20,9 +27,6 @@ extends =
   ../component/pycrypto-python/buildout.cfg
   ../component/mysql-python/buildout.cfg
   ../stack/slapos.cfg
-  ../component/python-2.7/buildout.cfg
-# python-2.7 component is here only for compatibility with old software.cfg.
-# It is not needed and should not be used in LAMP-based software.cfg
 
 [eggs]
 recipe = zc.recipe.egg

stack/lamp/buildout.cfg

@@ -35,6 +35,8 @@ extends =
   ../../component/mysql-python/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../slapos.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/curl/buildout.cfg
 
 [mariadb]
 # Compile dir is for plugins, there's no plugin in LAMP
@@ -64,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = f8a1599f19a67d948f4a1f32f3bd3e2f
+md5sum = ae9c0f8c70a62f13eb948424c99d71e2
 mode = 0644
 
 [template-apache-backup]
@@ -85,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 70ab558c2e925c3627c39fbc20a7501c
+md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -116,6 +118,14 @@ output = ${buildout:directory}/template-pull-backup.cfg
 md5sum = 9aab30ba5aa23a37d4b507e7c414be00
 mode = 0644
 
+# Dummy parts in case no application configuration file is needed
+[application-template]
+filename =
+location =
+
+[application-configuration]
+location =
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -180,100 +190,103 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-# Automatically picked by buildout-versions
 Jinja2 = 2.6
 Pygments = 1.5
-Sphinx = 1.1.3
 Werkzeug = 0.8.3
-apache-libcloud = 0.9.1
+apache-libcloud = 0.10.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9
+docutils = 0.9.1
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.cmmi = 1.5.1
+ipython = 0.12.1
 meld3 = 0.6.8
-pycrypto = 2.5
+pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.52
-slapos.recipe.build = 0.7
+slapos.cookbook = 0.55
+slapos.recipe.build = 0.9
 slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.3
-slapos.toolbox = 0.24
+slapos.recipe.template = 2.4
+slapos.toolbox = 0.25
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.24
-# slapos.toolbox==0.24
+# slapos.core==0.25
+# slapos.toolbox==0.25
 Flask = 0.8
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.25
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.55
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.24
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.toolbox==0.25
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.25
 feedparser = 5.1.2
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.55
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.core==0.24
+# slapos.cookbook==0.55
+# slapos.core==0.25
 # xml-marshaller==0.9.7
 lxml = 2.3.4
 
 # Required by:
-# slapos.cookbook==0.52
-netaddr = 0.7.6
+# slapos.cookbook==0.55
+netaddr = 0.7.7
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.24
-paramiko = 1.7.7.1
+# slapos.toolbox==0.25
+paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.25
 psutil = 0.4.1
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.core==0.24
-# slapos.toolbox==0.24
-# zc.buildout==1.6.0-dev-SlapOS-003
+# slapos.cookbook==0.55
+# slapos.core==0.25
+# slapos.toolbox==0.25
+# zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.toolbox==0.24
-slapos.core = 0.24
+# slapos.cookbook==0.55
+# slapos.toolbox==0.25
+slapos.core = 0.25
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.toolbox==0.24
+# slapos.cookbook==0.55
+# slapos.toolbox==0.25
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.55
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 4.0.0
+# slapos.core==0.25
+zope.interface = 4.0.1

stack/lamp/instance-apache-php.cfg

@@ -9,6 +9,8 @@ parts =
   cron
   cron-entry-logrotate
   promise
+  slapmonitor
+  slapreport
   frontend-promise
   publish-connection-informations
 
@@ -16,64 +18,36 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/apache
-hostname = $${apache-php:ip}
-port = $${apache-php:port}
-
-[frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/frontend
-url = $${request-frontend:connection-site_url}
-dash_path = ${dash:location}/bin/dash
-
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-backend_url = $${apache-php:url}
-url = $${request-frontend:connection-site_url}
-
-[mariadb-urlparse]
-recipe = slapos.cookbook:urlparse
-url = $${request-mariadb:connection-url}
-
-[apache-php]
-recipe = slapos.cookbook:apachephp
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 
-htdocs = $${rootdirectory:srv}/www/
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-url = http://[$${:ip}]:$${:port}/
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-php-ini-dir = $${directory:php-ini-dir}
-tmp-dir = $${directory:tmp-php}
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
+# Creation of all needed directories
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
 
-mysql-username = $${mariadb-urlparse:username}
-mysql-password = $${mariadb-urlparse:password}
-mysql-database = $${mariadb-urlparse:path}
-mysql-host = $${stunnel:local-host}
-mysql-port = $${stunnel:local-port}
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
 
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
+[directory]
+recipe = slapos.cookbook:mkdirectory
+ca-dir = $${rootdirectory:srv}/ssl/
+httpd-log = $${basedirectory:log}/apache/
+php-ini-dir = $${rootdirectory:etc}/php/
+tmp-php = $${rootdirectory:tmp}/php/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+stunnel-conf = $${rootdirectory:etc}/stunnel/
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -83,14 +57,8 @@ certs = $${directory:ca-dir}/certs/
 newcerts = $${directory:ca-dir}/newcerts/
 crl = $${directory:ca-dir}/crl/
 
-[ca-stunnel]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-executable = $${stunnel:wrapper}
-wrapper = $${basedirectory:services}/stunnel
-key-file = $${stunnel:key-file}
-cert-file = $${stunnel:cert-file}
 
+# Deploy stunnel
 [stunnel]
 recipe = slapos.cookbook:stunnel
 client = true
@@ -107,6 +75,29 @@ pid-file = $${basedirectory:run}/stunnel.pid
 wrapper = $${rootdirectory:bin}/raw_stunnel
 post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
+
+# Certificate stuffs
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[ca-stunnel]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${stunnel:wrapper}
+wrapper = $${basedirectory:services}/stunnel
+key-file = $${stunnel:key-file}
+cert-file = $${stunnel:cert-file}
+
+
+# Request MariaDB instance and parse its URL
 [request-mariadb]
 <= slap-connection
 recipe = slapos.cookbook:request
@@ -115,17 +106,41 @@ software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
 
-[request-frontend]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Frontend
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config = url
-config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
-return = site_url
+[mariadb-urlparse]
+recipe = slapos.cookbook:urlparse
+url = $${request-mariadb:connection-url}
+
+
+# Deploy Apache + PHP application
+[apache-php]
+recipe = slapos.cookbook:apachephp
+source = ${application:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
 
+htdocs = $${rootdirectory:srv}/www/
+pid-file = $${basedirectory:run}/apache.pid
+lock-file = $${basedirectory:run}/apache.lock
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+url = http://[$${:ip}]:$${:port}/
+error-log = $${directory:httpd-log}/error.log
+access-log = $${directory:httpd-log}/access.log
+php-ini-dir = $${directory:php-ini-dir}
+tmp-dir = $${directory:tmp-php}
+httpd-conf = $${rootdirectory:etc}/apache.conf
+wrapper = $${basedirectory:services}/apache
+
+httpd-binary = ${apache:location}/bin/httpd
+
+mysql-username = $${mariadb-urlparse:username}
+mysql-password = $${mariadb-urlparse:password}
+mysql-database = $${mariadb-urlparse:path}
+mysql-host = $${stunnel:local-host}
+mysql-port = $${stunnel:local-port}
+
+
+# Deploy logrotate, cron, configure it
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
@@ -161,6 +176,11 @@ notifempty = true
 create = true
 post = $${stunnel:post-rotate-script}
 
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
+
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
@@ -170,11 +190,6 @@ cronstamps = $${directory:cronstamps}
 catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
 [cron-entry-logrotate]
 <= cron
 recipe = slapos.cookbook:cron.d
@@ -182,31 +197,71 @@ name = logrotate
 frequency = 0 0 * * *
 command = $${logrotate:wrapper}
 
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-tmp = $${buildout:directory}/tmp/
 
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
-run = $${rootdirectory:var}/run/
-backup = $${rootdirectory:srv}/backup/
-promises = $${rootdirectory:etc}/promise/
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url custom_domain
+config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+return = site_url
+config-custom_domain = $${slap-parameter:domain}
 
-[directory]
-recipe = slapos.cookbook:mkdirectory
-ca-dir = $${rootdirectory:srv}/ssl/
-httpd-log = $${basedirectory:log}/apache/
-php-ini-dir = $${rootdirectory:etc}/php/
-tmp-php = $${rootdirectory:tmp}/php/
-logrotate-entries = $${rootdirectory:etc}/logrotate.d/
-logrotate-backup = $${basedirectory:backup}/logrotate/
-stunnel-conf = $${rootdirectory:etc}/stunnel/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
+
+# Deploy slapmonitor
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/apache.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/apache.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
+
+
+# Publish all instance parameters (url of instance)
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = $${apache-php:url}
+url = $${request-frontend:connection-site_url}
+
+
+# Deploy promises scripts
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/apache
+hostname = $${apache-php:ip}
+port = $${apache-php:port}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+
+[slap-parameter]
+# Default value if no domain is specified
+domain =
+# Default value if no ssh parameter is specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =

stack/lamp/instance-mariadb.cfg

@@ -11,6 +11,8 @@ parts =
   logrotate-entry-cron
   cron
   cron-entry-logrotate
+  slapmonitor
+  slapreport
 
 gzip-binary = ${gzip:location}/bin/gzip
 
@@ -49,6 +51,26 @@ mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
 mysqld-binary = ${mariadb:location}/libexec/mysqld
 
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/mariadb.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/mariadb.pid
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+database-path = $${basedirectory:log}/slapmonitor.db
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
@@ -185,3 +207,10 @@ mariadb-data = $${rootdirectory:srv}/mariadb/
 logrotate-backup = $${basedirectory:backup}/logrotate/
 stunnel-conf = $${rootdirectory:etc}/stunnel/
 logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+
+[slap-parameter]
+#Default  value if no ssh parameters specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =

stack/nodejs.cfg

 [buildout]
 extends =
   ../component/nodejs/buildout.cfg
-  ../component/lxml-python/buildout.cfg
   ../stack/slapos.cfg
 
-versions = versions
-
 parts =
-  eggs
   nodejs
-  npm
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  slapos.cookbook
-  ${lxml-python:egg}

stack/slapos.cfg

@@ -2,14 +2,17 @@
 # Software Releases or Stacks can safely extend this stack.
 
 [buildout]
+# Developers need to add explicitely this part in their software profile
+parts = slapos-cookbook
+
 # Generate list of automatically chosen eggs version
 extensions +=
   buildout-versions
 
 # Use shacache and lxml
 extends =
-  shacache-client.cfg
   ../component/lxml-python/buildout.cfg
+  shacache-client.cfg
   
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -30,19 +33,18 @@ allow-hosts +=
   dist.repoze.org
   effbot.org
   github.com
+  launchpad.net
   peak.telecommunity.com
   psutil.googlecode.com
+  sourceforge.net
   www.dabeaz.com
   www.owlfish.com
-  launchpad.net
 
 # 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
 
-parts += slapos-cookbook
-
 versions = versions
 
 # Install slapos.cookbook containing all officials recipes
@@ -53,8 +55,5 @@ eggs =
   slapos.cookbook
 
 [versions]
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-001
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006