Merge master in lamp-mohamadou branch

CHANGES.txt

 Changes
 =======
 
-0.44 (Unreleased)
+0.46 (Unreleased)
 -----------------
 
-  * No change yet
+  * No change yet.
+
+0.45 (2012-03-29)
+-----------------
+
+  * slaprunner: change number of available partitions to 7 [Alain Takoudjou]
+
+0.44 (2012-03-28)
+-----------------
+
+  * minor: apachephp: update apache configuration to work with Apache2.4
 
 0.43 (2012-03-28)
 -----------------

component/cloud9/buildout.cfg

@@ -26,7 +26,7 @@ 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=/opt/slapgrid/c86b6d036d0004572b96e10de1a1b5e8/parts/nodejs-0.4/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+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)
 update-command =
 
 [cloud9-npm]

component/gnutls/buildout.cfg

@@ -13,13 +13,13 @@ md5sum = 7c2710ef439f82ac429b88fec88e9a4c
 
 [gcrypt]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.gz
-md5sum = bfd45922eefb8a24d598af77366220d4
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
+md5sum = 78f8f8bec4580f75b25816f7896d0389
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
   CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
+  LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
 
 [gnutls]
 # XXX-Cedric : update to latest gnutls
@@ -28,7 +28,8 @@ url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
 configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
+  --disable-static
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
-  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
+  LDFLAGS=-lgcrypt -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
   PKG_CONFIG=${zlib:location}/lib/pkgconfig

component/nodejs/buildout.cfg

@@ -46,6 +46,5 @@ commit = 3136abc5c6b3ed332c4700ece24450fada63639b
 origin = https://github.com/isaacs/npm.git
 git-bin = ${git:location}/bin/git
 node-bin = ${nodejs-0.4:location}/bin/node
-command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node_bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
+command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node-bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
 update-command =
-

component/slapos/buildout.cfg

@@ -120,17 +120,17 @@ Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
 hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.3
+lxml = 2.3.4
 meld3 = 0.6.8
 netaddr = 0.7.6
-slapos.core = 0.23
+slapos.core = 0.24
 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.23
+# slapos.core==0.24
 Flask = 0.8
 
 # Required by:
@@ -138,11 +138,11 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-004
@@ -150,9 +150,9 @@ netifaces = 0.8
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 zope.interface = 3.8.0

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.44-dev'
+version = '0.46-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/apachephp/template/apache.in

@@ -3,7 +3,6 @@
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
 Listen %(ip)s:%(port)s
 PHPINIDir %(php_ini_dir)s
 ServerAdmin someone@email
@@ -25,20 +24,21 @@ CustomLog "%(access_log)s" common
 <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Order deny,allow
-    Deny from all
+    Require all denied
 </Directory>
 
 <Directory %(document_root)s>
   Options FollowSymLinks
   AllowOverride All
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 DocumentRoot %(document_root)s
 DirectoryIndex index.html index.php
 
 # List of modules
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule setenvif_module modules/mod_setenvif.so

slapos/recipe/lamp/__init__.py

@@ -33,6 +33,8 @@ import sys
 import zc.recipe.egg
 import urlparse
 
+# Warning : this recipe is deprecated and has been replaced by apachephp.
+
 class BaseRecipe(BaseSlapRecipe):
   def getTemplateFilename(self, template_name):
     return pkg_resources.resource_filename(__name__,

slapos/recipe/slaprunner/__init__.py

@@ -40,6 +40,7 @@ class Recipe(BaseSlapRecipe):
     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')
@@ -48,7 +49,7 @@ class Recipe(BaseSlapRecipe):
         instance_root=instance_root,
         master_url='http://%s:%s/' % (ipv4, proxy_port),
         computer_id='slaprunner',
-        partition_amount=2,
+        partition_amount=7,
         slapgrid_sr=self.options['slapgrid_sr'],
         slapgrid_cp=self.options['slapgrid_cp'],
         slapproxy=self.options['slapproxy'],
@@ -64,9 +65,11 @@ class Recipe(BaseSlapRecipe):
         proxy_port=proxy_port,
         proxy_database=os.path.join(workdir, 'proxy.db'),
 	git=self.options['git'],
+	cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port),
 	ssh_client=self.options['ssh_client'],
 	public_key=self.options['public_key'],
-	private_key=self.options['private_key']
+	private_key=self.options['private_key'],
+
     )
     config_file = self.createConfigurationFile('slapos.cfg',
         self.substituteTemplate(pkg_resources.resource_filename(__name__,
@@ -77,9 +80,18 @@ class Recipe(BaseSlapRecipe):
         PATH=os.path.dirname(self.options['git']) + ':' + 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.setConnectionDict(dict(url='http://[%s]:%s' % (ipv6, runner_port)))
+    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

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

@@ -31,3 +31,6 @@ private_key = %(private_key)s
 
 [gitclient]
 git = %(git)s
+
+[cloud9_IDE]
+cloud9 = %(cloud9_url)s
\ No newline at end of file

software/lamp-template/software.cfg

@@ -7,7 +7,6 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
   
 extends =
   ../../stack/lamp.cfg
@@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application
 md5sum = Student may put here md5sum of this file, this is good idea
 #If provided tarball does not contain top directory, option shall be changed to false
 strip-top-level-dir = true
-#extract-directory = 
 
 [application-template]
 recipe = slapos.recipe.download
@@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[mariadb]
-keep-compile-dir = false
-
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 eggs = 
   ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-# Generated by buildout-versions
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-plone.recipe.command = 1.1
-slapos.cookbook = 0.20
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# 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:
-# slapos.cookbook==0.38
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-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
-

software/slaprunner/instance.cfg

@@ -16,6 +16,8 @@ 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}

software/slaprunner/software.cfg

 [buildout]
+
 extensions =
   buildout-versions
 
@@ -8,6 +9,7 @@ extends =
   ../../stack/shacache-client.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
+  ../../component/cloud9/buildout.cfg
 
 parts =
   template
@@ -31,7 +33,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = cd69efd5c3a7e9adca7387b9a401590a
+md5sum = 7cfd248cdc6fa6cbb4957d25a0aed884
 
 [eggs]
 eggs +=
@@ -60,6 +62,7 @@ signature-certificate-list =
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-003
+
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 apache-libcloud = 0.8.0
@@ -68,68 +71,65 @@ buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.8
+plone.recipe.command = 1.1
 pycrypto = 2.5
-slapos.cookbook = 0.39
+slapos.cookbook = 0.45
 slapos.libnetworkcache = 0.12
-slapos.recipe.template = 2.2
-slapos.toolbox = 0.18
+slapos.recipe.template = 2.3
+slapos.toolbox = 0.20
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.22
+# slapos.core==0.24
 Flask = 0.8
 
 # Required by:
-# slapos.toolbox==0.18
+# slapos.toolbox==0.20
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.39
+# slapos.cookbook==0.45
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.18
+# slapos.toolbox==0.20
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.18
-feedparser = 5.1
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+# slapos.toolbox==0.20
+feedparser = 5.1.1
 
 # Required by:
-# slapos.cookbook==0.39
+# slapos.cookbook==0.45
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.39
-# slapos.core==0.22
+# slapos.cookbook==0.45
+# slapos.core==0.24
 # xml-marshaller==0.9.7
-lxml = 2.3.3
+lxml = 2.3.4
 
 # Required by:
-# slapos.cookbook==0.39
+# slapos.cookbook==0.45
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.22
+# slapos.core==0.24
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.18
+# slapos.toolbox==0.20
 paramiko = 1.7.7.1
 
 # Required by:
-# slapos.toolbox==0.18
+# slapos.toolbox==0.20
 psutil = 0.4.1
 
 # Required by:
-# slapos.cookbook==0.39
-# slapos.core==0.22
+# slapos.cookbook==0.45
+# slapos.core==0.24
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.18
+# slapos.toolbox==0.20
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-003
 # zc.recipe.egg==1.3.2
@@ -137,21 +137,21 @@ psutil = 0.4.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.39
-slapos.core = 0.22
+# slapos.cookbook==0.45
+slapos.core = 0.24
 
 # Required by:
-# slapos.core==0.22
+# slapos.core==0.24
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.39
+# slapos.cookbook==0.45
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.39
+# slapos.cookbook==0.45
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.22
+# slapos.core==0.24
 zope.interface = 3.8.0
\ No newline at end of file

stack/lamp.cfg

 [buildout]
-extensions = buildout-versions
-
-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
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  launchpad.net
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
 parts =
   template
   apache-php
@@ -38,7 +19,7 @@ extends =
   ../component/stunnel/buildout.cfg  
   ../component/pycrypto-python/buildout.cfg
   ../component/mysql-python/buildout.cfg
-  shacache-client.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
@@ -52,14 +33,6 @@ eggs =
 [mariadb]
 keep-compile-dir = false
 
-[application]
-#XXX-Cedric : ugly hack to work around h.r.cmmi unrespectful behavior, so that
-#             a cmmi Executes before application but after template downloading.
-#             Useful when [application] uses slapos.recipe.build or
-#             slapos.recipe.download rather than h.r.download.
-depends = ${apache-php:location}
-
-
 [networkcache]
 # Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
 signature-certificate-list =
@@ -102,3 +75,98 @@ signature-certificate-list =
   dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
   n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
   -----END CERTIFICATE-----
+
+[versions]
+# Generated automatically by buildout-versions
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.3
+apache-libcloud = 0.9.1
+async = 0.6.1
+buildout-versions = 1.7
+gitdb = 0.5.4
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.8
+plone.recipe.command = 1.1
+slapos.cookbook = 0.45
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.3
+slapos.toolbox = 0.23
+smmap = 0.8.2
+
+# Required by:
+# slapos.core==0.24
+# slapos.toolbox==0.23
+Flask = 0.8
+
+# Required by:
+# slapos.toolbox==0.23
+GitPython = 0.3.2.RC1
+
+# Required by:
+# slapos.cookbook==0.45
+PyXML = 0.8.4
+
+# Required by:
+# slapos.toolbox==0.23
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.23
+feedparser = 5.1.1
+
+# Required by:
+# slapos.cookbook==0.45
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.45
+# slapos.core==0.24
+# slapos.toolbox==0.23
+# xml-marshaller==0.9.7
+lxml = 2.3.4
+
+# Required by:
+# slapos.cookbook==0.45
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.24
+netifaces = 0.8
+
+# Required by:
+# slapos.toolbox==0.23
+paramiko = 1.7.7.1
+
+# Required by:
+# slapos.toolbox==0.23
+psutil = 0.4.1
+
+# Required by:
+# slapos.cookbook==0.45
+# slapos.core==0.24
+# slapos.toolbox==0.23
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.45
+# slapos.toolbox==0.23
+slapos.core = 0.24
+
+# Required by:
+# slapos.core==0.24
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.45
+# slapos.toolbox==0.23
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.45
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.24
+zope.interface = 3.8.0
\ No newline at end of file

stack/lamp/buildout.cfg

 [buildout]
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 parts =
   apache-php
   mariadb
@@ -18,21 +15,7 @@ parts =
   template-mariadb-pbsready-import
   template-mariadb-pbsready-export
 
-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
-  launchpad.net
-
 extends =
-  ../shacache-client.cfg
   ../../component/mariadb/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
@@ -40,7 +23,6 @@ extends =
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/perl/buildout.cfg
   ../../component/sqlite3/buildout.cfg
   ../../component/lxml-python/buildout.cfg
@@ -52,6 +34,9 @@ extends =
   ../../component/mysql-python/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../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
 
 versions = versions
 
@@ -65,7 +50,6 @@ module = lamp.request
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-#python = python2.7
 eggs = ${instance-recipe:egg}
 
 [application]
@@ -84,7 +68,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 45bc82dc468e7f418d95c846d1a33d74
+md5sum = 8ebed1e26127c066e5b69372e69e6c38
 mode = 0644
 
 [template-apache-backup]

stack/lamp/instance-apache-php.cfg

@@ -12,6 +12,7 @@ parts =
   logrotate-entry-stunnel
   cron
   cron-entry-logrotate
+  promise
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -21,6 +22,12 @@ offline = true
 recipe = slapos.cookbook:publishurl
 url = http://[$${apache-php:ip}]:$${apache-php:port}/
 
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/apache
+hostname = $${apache-php:ip}
+port = $${apache-php:port}
+
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse
 url = $${request-mariadb:connection-url}
@@ -43,8 +50,6 @@ tmp-dir = $${directory:tmp-php}
 httpd-conf = $${rootdirectory:etc}/apache.conf
 wrapper = $${basedirectory:services}/apache
 
-promise = $${basedirectory:promises}/apache
-
 httpd-binary = ${apache:location}/bin/httpd
 
 mysql-username = $${mariadb-urlparse:username}