Merge branch 'master' into slapos

Conflicts:
	component/slapos/buildout.cfg

CHANGES.txt

 Changes
 =======
 
-0.65 (2012-09-07)
+0.66 (2012-09-10)
 -----------------
 
-  * No change yet.
+  * Add check_page_content promise generator. [Cedric Le Ninivin]
 
 0.65 (2012-09-07)
 -----------------

component/cloud9/buildout.cfg

@@ -16,7 +16,7 @@ parts =
 
 [node-sm]
 recipe = slapos.recipe.build:npm
-packages = sm
+packages = sm@0.2.7
 node = nodejs
 environment =
   PATH=${nodejs:location}/bin:%(PATH)s
@@ -35,6 +35,7 @@ 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; export HOME=${:location}; (${: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)
 update-command =
+executable = ${:location}/bin/cloud9.js
 
 [cloud9-git]
 # Online IDE written in javascript/node.js
@@ -43,12 +44,13 @@ update-command =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 1f46081df51e6654cef17c205fbf589b219133a7
+commit = c66284221143c175fc889418d499da6f37492a7c
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${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 clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
 update-command =
+executable = ${:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js

component/mydumper/buildout.cfg

@@ -3,6 +3,7 @@
 extends =
     ../cmake/buildout.cfg
     ../glib/buildout.cfg
+    ../openssl/buildout.cfg
     ../pcre/buildout.cfg
     ../mariadb/buildout.cfg
 
@@ -15,17 +16,17 @@ parts = mydumper
 recipe = slapos.recipe.build
 depends =
   ${mariadb:version}
-url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
-md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
+md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}
 cmake-command = ${cmake:location}/bin/cmake
 mysql-config = ${mariadb:location}/bin/mysql_config
-doc-dependency = ${mydumper-doc:eggs}
 mysqllib = ${mariadb:location}/lib
-pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
+mysql-include-dir = ${mariadb:location}/include
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =
@@ -49,17 +50,13 @@ script =
                     '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
                     '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
                     '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '-DMYSQL_INCLUDE_DIR=%%s' %% self.options['mysql-include-dir'],
+                    '-DBUILD_DOCS=OFF',
                     '.']
     call(command_line, cwd=workdir, env=env)
     call(['make'], cwd=workdir, env=env)
     call(['make', 'install'], cwd=workdir, env=env)
 
-[mydumper-doc]
-recipe = zc.recipe.egg
-eggs =
-    Sphinx
-dependent-scripts = true
-
 # XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
 # and it wasn't working !
 #[mydumper]
@@ -78,4 +75,3 @@ dependent-scripts = true
 #environment=
 #    PATH=$PATH:${buildout:bin-directory}
 #    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-

component/nodejs/buildout.cfg

@@ -9,6 +9,24 @@ parts =
   nodejs
 
 [nodejs]
+<= nodejs-0.8
+
+[nodejs-0.8]
+# Server-side Javascript.
+recipe = hexagonit.recipe.cmmi
+url = http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz
+md5sum = f4dae84e96a94b768404c14633bccd49
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-0.6]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
 url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz

component/slapos/buildout.cfg

@@ -117,50 +117,43 @@ scripts =
 zc.buildout = 1.6.0-dev-SlapOS-007
 
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-docutils = 0.9.1
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
-lxml = 2.3.5
+lxml = 3.0alpha2
 meld3 = 0.6.8
-netaddr = 0.7.7
-slapos.core = 0.28.5
+netaddr = 0.7.10
+slapos.core = 0.28.6
 slapos.libnetworkcache = 0.13.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.28.5
+# slapos.core==0.28.6
 Flask = 0.9
 
-# Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
 # Required by:
 # hexagonit.recipe.cmmi==1.6
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.core==0.28.5
+# slapos.core==0.28.6
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.28.5
-# slapos.libnetworkcache==0.12
+# slapos.core==0.28.6
+# slapos.libnetworkcache==0.13.2
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.28.5
+# slapos.core==0.28.6
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.28.5
+# slapos.core==0.28.6
 zope.interface = 4.0.1

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.66-dev'
+version = '0.67-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 = slapos.recipe.certificate_authority:Recipe',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
           'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
           'cron.d = slapos.recipe.dcron:Part',

slapos/recipe/check_page_content/__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
+import sys
+
+class Recipe(GenericBaseRecipe):
+  """
+  Create script that will check if content at "url" is available 
+  (e.g page has a link to itself).
+  """
+
+  def install(self):
+    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
+    promise = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('check_page_content.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_page_content/template/check_page_content.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+URL="%(url)s"
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
+%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null
+
+if [ $? != 0 ]; then
+  echo "Content at $URL seems to be corrupted" >&2
+  exit 1
+fi

slapos/recipe/check_url_available/template/check_url.in

@@ -11,6 +11,10 @@ fi
 
 CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
 
+if [ ! $CODE ]; then
+  echo "$URL is not available (server not reachable)." >&2
+  exit 1
+
 if [ $CODE -eq 000 ]; then
   echo "$URL is not available (server not reachable)." >&2
   exit 1

software/joomla/database.xml-in

+<?xml version="1.0" encoding="utf-8"?>
+<form>
+  <fieldset>
+  	<fieldset name="basic">
+			<field name="db_type" type="databaseconnection"
+				id="db_type" class="inputbox"
+				label="INSTL_DATABASE_TYPE_LABEL"
+				supported="mysql,mysqli,sqlsrv,sqlazure"
+				required="true"
+				default="mysql"
+				filter="string"
+			/>
+
+			<field name="db_host" type="text" id="db_host" class="inputbox"
+				label="INSTL_DATABASE_HOST_LABEL"
+				default="%(mysql_host)s"
+				required="true"
+			/>
+			<field name="db_user" type="text" id="db_user" class="inputbox"
+				label="INSTL_DATABASE_USER_LABEL"
+        default="%(mysql_user)s"
+				required="true"
+			/>
+			<field name="db_pass" type="password" id="db_pass" class="inputbox"
+				label="INSTL_DATABASE_PASSWORD_LABEL"
+        default="%(mysql_password)s"
+				filter="raw"
+			/>
+			<field name="db_name" type="text" id="db_name" class="inputbox"
+				label="INSTL_DATABASE_NAME_LABEL"
+        default="%(mysql_database)s"
+				required="true"
+			/>
+		</fieldset>
+
+		<!-- Advanced Settings -->
+		<fieldset name="advanced">
+			<field name="db_old" type="radio" id="db_old" class="inputbox"
+				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
+				default="backup"
+				required="true"
+			>
+				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
+				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
+			</field>
+			<field name="db_prefix" type="prefix" id="db_prefix" class="inputbox"
+				label="INSTL_DATABASE_PREFIX_LABEL"
+				required="true"
+				validate="prefix"
+				message="INSTL_DATABASE_PREFIX_MSG"
+			/>
+		</fieldset>
+	</fieldset>
+</form>

software/joomla/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_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql

software/joomla/software.cfg

 [buildout]
 versions = versions
 
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
+
   
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
   ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz
-md5sum = 19451c0352e4c72d871cc8817126286a
-  
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+url = http://joomlacode.org/gf/download/frsrelease/17173/74758/Joomla_2.5.6-Stable-Full_Package.zip
+md5sum = 3aa7d7b58bfa4eec3c3724209894d14e
+strip-top-level-dir = false
+  
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/database.xml-in
+md5sum = 6ae063318a251b70ae7d037e3ae375d6 
+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.1
-
-# 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.6
-
-# 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
+[application-configuration]
+location = installation/models/forms/database.xml
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/kumofs/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/kumo/buildout.cfg
@@ -11,23 +6,7 @@ extends =
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-  www.owlfish.com
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -39,11 +18,6 @@ parts =
   eggs
   instance-recipe-egg
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
 [instance-recipe]
 egg = slapos.cookbook
 module = kumofs
@@ -65,74 +39,6 @@ md5sum = 056a4af7128fd9e31da42c85cc039420
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-erp5.recipe.cmmiforcei686 = 0.1.3
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-rdiff-backup = 1.0.5
-slapos.cookbook = 0.38
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.5
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# xml-marshaller==0.9.7
-lxml = 2.3.3
-
-# Required by:
-# slapos.cookbook==0.38
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.21
-netifaces = 0.6
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.38
-slapos.core = 0.21
-
-# Required by:
-# slapos.core==0.21
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.38
-xml-marshaller = 0.9.7
-
-# Required by:
-# erp5.recipe.cmmiforcei686==0.1.3
-# slapos.cookbook==0.38
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
-
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =

software/mariadb/software.cfg

 [buildout]
 
-extensions =
-  slapos.zcbworkarounds
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 extends =
   ../../component/mariadb/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/stunnel/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/duplicity/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-# XXX: This is dirty, recipe trick shall be used.
-develop =
-  /opt/slapdev
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -50,28 +25,16 @@ parts =
   mariadb
   stunnel
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
 [instance-recipe]
 egg = slapos.cookbook
 module = mysql
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
 
@@ -103,20 +66,3 @@ url = ${:_profile_base_location_}/instance-recover.cfg
 md5sum = a8df936b6abf82d0d798b83ddfebdc8a
 output = ${buildout:directory}/template-recover.cfg
 mode = 0644
-
-[versions]
-slapos.cookbook =
-
-# Required by slapos.cookbook==0.25
-slapos.core = 0.4
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
-
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.1
-plone.recipe.command = 1.1
-
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-002

software/mysql-5.1/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/dcron/buildout.cfg
@@ -13,23 +9,7 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/xtrabackup/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-  www.owlfish.com
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
   template
@@ -42,11 +22,6 @@ parts =
   eggs
   instance-recipe-egg
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
 [instance-recipe]
 egg = slapos.cookbook
 module = mysql

software/slapos-testing/instance.cfg

@@ -8,6 +8,7 @@ offline = true
 
 [create-directory]
 recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
 services = $${:etc}/run
 srv = $${buildout:directory}/srv
@@ -32,7 +33,7 @@ repository = ${slapos.recipe.build-repository:location}
 
 [slapos-test-runner]
 recipe = slapos.cookbook:egg_test
-run-test-suite = $${buildout:bin-directory}/runTestSuite
+run-test-suite = $${create-directory:bin}/runTestSuite
 run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
 # The list of executables should be defined here and a combination
 # of tests should dynamically generated.
@@ -41,7 +42,7 @@ test-list =
   $${slapos.core:location}
   $${slapos.recipe.template:location}
   $${slapos.recipe.build:location}
-prepend-path = ${libxslt:location}/bin:${python2.7:location}/bin
+prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
 environment = environment
 
 [environment]

software/slapos-testing/software.cfg

@@ -67,7 +67,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 97a6ed2faa674819020cfc77ed64cbb0 
+md5sum = d7dbd5da07c1170d0b80199d99f932eb
 output =  ${buildout:directory}/template.cfg
 mode = 640
 

software/slaprunner/instance-runner.cfg

@@ -6,7 +6,10 @@ parts =
   dropbear-server-add-authorized-key
   sshkeys-authority
   publish-connection-informations
-  frontend-promise
+  slaprunner-promise
+  slaprunner-frontend-promise
+  cloud9-promise
+  dropbear-promise
 
   
 eggs-directory = ${buildout:eggs-directory}
@@ -57,8 +60,8 @@ port = 30000
 wrapper = $${basedirectory:services}/cloud9
 working-directory = $${runnerdirectory:home}
 git-binary = ${git:location}/bin/git
-node-binary = ${nodejs-0.4:location}/bin/node
-cloud9 = ${cloud9-stable:location}/bin/cloud9.js
+node-binary = ${nodejs:location}/bin/node
+cloud9 = ${cloud9:executable}
 
 [slaprunner]
 recipe = slapos.cookbook:slaprunner
@@ -147,23 +150,35 @@ cloud9_url = $${cloud9:access-url}
 ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
 password_recovery_code = $${recovery-code:passwd}
 
-[slap-parameter]
-# Default value if no ssh key is specified
-authorized-key =
-
-
 
 # Deploy promises scripts
-#[promise]
-#recipe = slapos.cookbook:check_port_listening
-#path = $${basedirectory:promises}/apache
-#hostname = $${apache-php:ip}
-#port = $${apache-php:port}
+[slaprunner-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/slaprunner
+hostname = $${slaprunner:ipv6}
+port = $${slaprunner:runner_port}
 
-[frontend-promise]
+[slaprunner-frontend-promise]
 recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/frontend
+path = $${basedirectory:promises}/slaprunner_frontend
 url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
+[cloud9-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/cloud9
+url = http://$${cloud9:ip}:$${cloud9:port}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[dropbear-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/dropbear
+hostname = $${dropbear-server:host}
+port = $${dropbear-server:port}
+
+
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =

software/slaprunner/software.cfg

@@ -25,7 +25,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = 82bf13fafa017245e853afad20ea3704
+md5sum = b57ebff565595fa92cd7d5adc6a22c7e
 mode = 0644
 
 [eggs]
@@ -56,48 +56,42 @@ signature-certificate-list =
 [versions]
 Flask-Auth = 0.8
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9.1
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.cookbook = 0.61
-slapos.libnetworkcache = 0.12
-slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28.2
+slapos.cookbook = 0.64.2
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.28.2
-# slapos.toolbox==0.28.2
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28.2
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.61
+# slapos.cookbook==0.64.2
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.toolbox==0.28.2
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28.2
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
@@ -105,58 +99,58 @@ feedparser = 5.1.2
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.61
+# slapos.cookbook==0.64.2
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.28.2
-# slapos.toolbox==0.28.2
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 # xml-marshaller==0.9.7
-lxml = 2.3.5
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.61
-netaddr = 0.7.7
+# slapos.cookbook==0.64.2
+netaddr = 0.7.9
 
 # Required by:
-# slapos.core==0.28.2
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28.2
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28.2
+# slapos.toolbox==0.30
 psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.61
-# slapos.core==0.28.2
-# slapos.libnetworkcache==0.12
-# slapos.toolbox==0.28.2
+# slapos.cookbook==0.64.2
+# slapos.core==0.28.5
+# slapos.libnetworkcache==0.13.2
+# slapos.toolbox==0.30
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.buildout==1.6.0-dev-SlapOS-007
 # zc.recipe.egg==1.3.2
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.61
-slapos.core = 0.28.2
+# slapos.cookbook==0.64.2
+slapos.core = 0.28.5
 
 # Required by:
-# slapos.core==0.28.2
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.61
+# slapos.cookbook==0.64.2
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.61
+# slapos.cookbook==0.64.2
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.28.2
+# slapos.core==0.28.5
 zope.interface = 4.0.1

software/wordpress/software.cfg

 [buildout]
-versions = versions
-
-  
 extends =
   ../../stack/lamp/buildout.cfg
 
-
 [application]
-url = http://wordpress.org/latest.tar.gz
-#md5sum = Student may put here md5sum of this file, this is good idea
+url = http://wordpress.org/wordpress-3.4.2.tar.gz
+md5sum = dfc56cee27eec8fb79070f033ecd4b25
 
 [application-template]
 recipe = slapos.recipe.download

software/xwiki/software.cfg

@@ -2,18 +2,12 @@
 extends =
   ../../stack/tomcat.cfg
 
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-versions = versions
-
 [instance-recipe]
 egg = slapos.cookbook
 module = xwiki
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [template]

stack/lamp/buildout.cfg

@@ -66,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 = 8bb0b03689d2be9566ed1ef3e96b4403
+md5sum = 59cee571ea0fcdf2e6c9b3195e258738
 mode = 0644
 
 [template-apache-backup]
@@ -87,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
+md5sum = 767452bc503ff6c1b7af0ebfac590c9f
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -266,48 +266,42 @@ signature-certificate-list =
 
 [versions]
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9.1
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
 meld3 = 0.6.8
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.60
-slapos.recipe.build = 0.10.2
+slapos.cookbook = 0.66
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.2
 slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
@@ -315,57 +309,58 @@ feedparser = 5.1.2
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.core==0.27
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
 # xml-marshaller==0.9.7
-lxml = 2.3.5
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.60
-netaddr = 0.7.7
+# slapos.cookbook==0.66
+netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28
-psutil = 0.6.0
+# slapos.toolbox==0.30
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.toolbox==0.28
-slapos.core = 0.27
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
+slapos.core = 0.28.5
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.toolbox==0.28
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 zope.interface = 4.0.1
+

stack/lamp/instance-apache-php.cfg

@@ -12,6 +12,7 @@ parts =
   slapmonitor
   slapreport
   frontend-promise
+  content-promise
   publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
@@ -105,6 +106,8 @@ name = MariaDB
 software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-id}
 
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse
@@ -256,6 +259,12 @@ url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
+[content-promise]
+recipe = slapos.cookbook:check_page_content
+path = $${basedirectory:promises}/content
+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

stack/slapos.cfg

@@ -59,7 +59,7 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-006
+zc.buildout = 1.6.0-dev-SlapOS-007
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache

stack/tomcat.cfg

@@ -3,24 +3,8 @@ extends =
   ../component/lxml-python/buildout.cfg
   ../component/java/buildout.cfg
   ../component/mysql-5.1/buildout.cfg
-  ../component/python-2.7/buildout.cfg
   ../component/tomcat/buildout.cfg
-  ../stack/shacache-client.cfg
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-# 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
+  ../stack/slapos.cfg
 
 parts =
   template
@@ -45,7 +29,6 @@ md5sum = 22e1aff6104bb9006f8744a02bf73124
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
   slapos.cookbook