Merge branch 'master' into erp5-component

72b1c269 · Kazuhiko Shiozaki · 5d5a7a53 · 248e6a26 · 72b1c269 · 72b1c269
Commit 72b1c269 authored 11 years ago by Kazuhiko Shiozaki
20 changed files
--- a/component/apache-wsgi/buildout.cfg
+++ b/component/apache-wsgi/buildout.cfg
+[buildout]
+
+extends = 
+  ../apache/buildout.cfg
+  ../python-2.7/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../gdbm/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../openssl/buildout.cfg
+  ../readline/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../zlib/buildout.cfg
+  ../file/buildout.cfg
+
+parts =
+  apache-wsgi
+
+[python2.7]
+configure-options =
+  --enable-shared
+  --disable-static
+  --enable-ipv6
+  --enable-unicode=ucs4
+  --with-system-expat
+  --with-threads
+
+environment =
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  LD_RUN_PATH=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  
+[apache-wsgi]
+recipe = hexagonit.recipe.cmmi
+url = http://modwsgi.googlecode.com/files/mod_wsgi-3.4.tar.gz
+md5sum = f42d69190ea0c337ef259cbe8d94d985
+configure-options =
+  --with-apxs=${apache:location}/bin/apxs
+  --with-python=${python2.7:location}/bin/python2.7
+environment =
+  CPPFLAGS = -I${python2.7:location}/include/python2.7
+  LDFLAGS = -L${python2.7:location}/lib
--- a/component/boinc-client/boinc-abs-path.patch
+++ b/component/boinc-client/boinc-abs-path.patch
+--- a/client/scripts/Makefile.am  2012-08-24 12:11:10.400291229 +0200
+++ b/client/scripts/Makefile.am  2012-09-10 15:21:01.973773228 +0200
+@@ -2,16 +2,16 @@
+
+ install-exec-hook:
+ 	chmod +x boinc-client
+-	$(INSTALL) -d $(DESTDIR)/etc/init.d
+-	$(INSTALL) -b boinc-client $(DESTDIR)/etc/init.d/boinc-client
+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/init.d
+	$(INSTALL) -b boinc-client $(DESTDIR)$(exec_prefix)/etc/init.d/boinc-client
+ 	if [ -d /etc/sysconfig ] ; then \
+-	  $(INSTALL) -d $(DESTDIR)/etc/sysconfig ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/sysconfig/boinc-client ; \
+	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/sysconfig ; \
+	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/sysconfig/boinc-client ; \
+ 	elif [ -d /etc/default ] ; then \
+-	  $(INSTALL) -d $(DESTDIR)/etc/default ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/default/boinc-client ; \
+	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/default ; \
+	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/default/boinc-client ; \
+ 	else \
+-	  $(INSTALL) -d $(DESTDIR)/etc ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/boinc-client.conf ; \
+	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc ; \
+	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/boinc-client.conf ; \
+ 	fi
+ 
\ No newline at end of file
--- a/component/boinc-client/buildout.cfg
+++ b/component/boinc-client/buildout.cfg
+[buildout]
+
+parts =
+  boinc
+
+extends =
+  ../curl/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+  ../subversion/buildout.cfg
+  ../m4/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openldap/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../../stack/slapos.cfg
+
+[download-boinc]
+recipe = slapos.recipe.download
+url = http://boinc.berkeley.edu/dl/boinc_7.0.28_x86_64-pc-linux-gnu.sh
+md5sum = efdfd115ae69227ceb6118ca09777988
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = boinc_7.0.28_x86_64-pc-linux-gnu.sh
+mode = 0744
+
+[boinc-bin]
+recipe = plone.recipe.command
+on_install = true
+on_update = true
+command = cp ${download-boinc:location}/${download-boinc:filename} ${buildout:parts-directory} && \
+  cd ${buildout:parts-directory} && \
+  ./${download-boinc:filename}
+#boinc client is a binary: write LD_LABRARY_PATH
+ld_library = ${curl:location}/lib:${openssl:location}/lib:${zlib:location}/lib
+location = ${buildout:parts-directory}/BOINC
+
+[boinc-patch]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/boinc-abs-path.patch
+md5sum = 412acedfbcdc8a9a7f196a02465da248
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = boinc-abs-path.patch
+
+
+#checkout boinc package from svn repository
+[boinc-package]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+svnversion = ${subversion:location}/bin/svnversion
+command = ${subversion:location}/bin/svn co http://boinc.berkeley.edu/svn/branches/server_stable ${:location} && \
+  sed -i 's#/usr/bin/svnversion#${:svnversion}#' ${:location}/tools/make_project
+
+# Compile now boinc client
+[boinc]
+recipe = hexagonit.recipe.cmmi
+url = ${boinc-package:location}
+source = ${buildout:parts-directory}/${:_buildout_section_name_}__compile__
+configure-command =
+  echo 'AC_PROG_OBJCXX' >> configure.ac
+  aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./_autosetup
+  ./configure
+
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --disable-fcgi
+  --disable-shared
+  --enable-static
+  --with-pic
+  --disable-manager
+  --disable-server
+  --with-pkg-config
+  --with-ssl=${openssl:location}
+  --with-libldap=${openldap:location}/lib
+  --with-libgnutls=${gnutls:location}/lib
+  --with-libcurl=${curl:location}/lib
+  --with-x=no
+
+patches =
+  ${boinc-patch:location}/${boinc-patch:filename}
+
+patch-options = -p1
+
+environment =
+  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:${curl:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  M4=${m4:location}/bin/m4
+  CFLAGS=-fPIC
+  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
+  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
--- a/component/boinc/buildout.cfg
+++ b/component/boinc/buildout.cfg
+[buildout]
+
+parts=
+  mariadb
+  boinc  
+
+extends =
+  ../subversion/buildout.cfg
+  ../m4/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openssl/buildout.cfg
+  ../cyrus-sasl/buildout.cfg
+  ../openldap/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../mariadb/buildout.cfg
+  ../curl/buildout.cfg
+  ../../stack/slapos.cfg
+
+[mariadb]
+# Compile dir is for plugins, not needed in boinc
+keep-compile-dir = false
+
+#checkout boinc package from svn repository
+[boinc-package]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+svnversion = ${subversion:location}/bin/svnversion
+command = ${subversion:location}/bin/svn co http://boinc.berkeley.edu/svn/branches/server_stable ${:location} && \
+  sed -i 's#/usr/bin/svnversion#${:svnversion}#' ${:location}/tools/make_project
+
+# Compile now boinc
+# When installing boinc python module, path /srv/slapgrid/... is strip to srv/slapgrid... It is why
+# we need to set --prefix="/${buildout:parts-directory}/${:_buildout_section_name_}"
+[boinc]
+recipe = hexagonit.recipe.cmmi
+url = ${boinc-package:location}
+keep-compile-dir = true
+source = ${buildout:parts-directory}/${:_buildout_section_name_}__compile__
+configure-command =
+  echo 'AC_PROG_OBJCXX' >> configure.ac
+  aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./_autosetup
+  ./configure
+configure-options = 
+  --prefix="/${buildout:parts-directory}/${:_buildout_section_name_}"
+  --disable-fcgi
+  --disable-shared
+  --enable-static
+  --with-pic
+  --disable-manager
+  --disable-client
+  --with-pkg-config
+  --with-ssl=${openssl:location}
+  --with-libsasl2=${cyrus-sasl:location}/lib
+  --with-libldap=${openldap:location}/lib
+  --with-libgnutls=${gnutls:location}/lib
+  --with-libcurl=${curl:location}/lib
+  --with-x=no
+
+environment =
+  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  M4=${m4:location}/bin/m4
+  CFLAGS=-fPIC
+  CPPFLAGS=-I${openssl:location}/include -I${mariadb:location}/include
+  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  MYSQL_CONFIG=${mariadb:location}/bin/mysql_config
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
+  
\ No newline at end of file
--- a/component/condor/buildout.cfg
+++ b/component/condor/buildout.cfg
+[buildout]
+
+parts = 
+  condor
+  libexpat
+  kerberos
+  perl
+  openldap
+  java
+  dash
+  zlib
+
+extends =
+  ../libexpat/buildout.cfg
+  ../kerberos/buildout.cfg
+  ../perl/buildout.cfg
+  ../java/buildout.cfg
+  ../openldap/buildout.cfg
+  ../dash/buildout.cfg
+  ../zlib/buildout.cfg
+  ../../stack/slapos.cfg
+  
+[condor]
+recipe = hexagonit.recipe.download
+url = https://doc-0c-60-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/5sp63u5v03ie9nu49dfodreb2dcomstb/1369231200000/01656987990562299665/*/0B9HYL8A0vSryTTIxX29rM0N6N28?e=download
+md5sum = e7d96746fc9102ca4583f8cd5eb472e0
+strip-top-level-dir = true
--- a/component/gnutls/buildout.cfg
+++ b/component/gnutls/buildout.cfg
 [buildout]
-extends = 
+extends =
  ../readline/buildout.cfg
  ../ncurses/buildout.cfg
  ../zlib/buildout.cfg

--- a/component/kerberos/buildout.cfg
+++ b/component/kerberos/buildout.cfg
+[buildout]
+
+parts =
+    kerberos
+
+extends = 
+  ../../component/bison/buildout.cfg
+
+[kerberos-package]
+recipe = hexagonit.recipe.download
+url = http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
+md5sum = 76c6bed945c5771674357cfd4a08e3f5
+
+[kerberos]
+recipe = hexagonit.recipe.cmmi
+url = ${kerberos-package:location}/krb5-1.11.1.tar.gz
+configure-command = src/configure
+configure-options =
+    --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+
+environment =
+  PATH=${bison:location}/bin:%(PATH)s
\ No newline at end of file
--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
 [buildout]
 extends =
  ../libxml2/buildout.cfg
-  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg

 parts =
@@ -19,7 +18,5 @@ configure-options =
  --without-debug
  --without-debugger
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  CPPFLAGS=-I${zlib:location}/include -I${libxml2:location}/include 
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/redis/buildout.cfg
+++ b/component/redis/buildout.cfg
+[buildout]
+
+parts =
+  redis
+
+extends = ../tcl/buildout.cfg
+
+[redis]
+recipe = hexagonit.recipe.cmmi
+url = https://github.com/geoffgarside/redis/archive/ipv6.tar.gz
+md5sum = 0eb594bd4e8ee746a0e2ef67b28cb5d8
+configure-command = true
+prefix = 
+make-options =
+  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  V=1
+make-targets = 
+  install
+  test
+environment =
+  PATH=${tcl:location}/bin:%(PATH)s
\ No newline at end of file
--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -10,6 +10,7 @@ extends =
  ../pkgconfig/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
+  ../swig/buildout.cfg
 parts =
  subversion

@@ -59,3 +60,45 @@ environment =
  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+
+
+[subversion-1.9]
+recipe = hexagonit.recipe.cmmi
+url = http://www.apache.org/dist/subversion/subversion-1.7.9.tar.gz
+md5sum = dfb083e8bfac88aa28d606168b08e4ff
+configure-options =
+  --disable-static
+  --with-apr=${apache:location}/bin/apr-1-config
+  --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-apxs=${apache:location}/bin/apxs
+  --with-zlib=${zlib:location}
+  --with-sqlite=${sqlite3:location}
+  --with-neon=${neon:location}
+  --with-swig=${swig:location}/bin/swig
+  --without-berkeley-db
+  --without-sasl
+  --without-apr_memcache
+  --without-gnome-keyring
+  --without-kwallet
+  --without-jdk
+  --without-jikes
+  --without-junit
+  --without-ctypesgen
+  --without-ruby-sitedir
+  --without-ruby-test-verbose
+  --disable-nls
+
+# it seems that parallel build sometimes fails.
+make-options =
+  -j1
+
+make-targets = 
+  install
+  swig-py
+  install-swig-py
+
+environment =
+  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
+  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
--- a/component/tcl/buildout.cfg
+++ b/component/tcl/buildout.cfg
+[buildout]
+parts = tcl
+
+[tcl-package]
+recipe = hexagonit.recipe.download
+url = http://prdownloads.sourceforge.net/tcl/tcl8.5.13-src.tar.gz
+md5sum = fa3a9bf9b2d6ed2431f1baa46f4058b8
+strip-top-level-dir = true
+
+[tcl]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = cd ${tcl-package:location}/unix &&
+  ./configure --prefix=${:location} &&
+  make &&
+  make test &&
+  make install
\ No newline at end of file
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,7 @@ setup(name=name,
        'netaddr', # to manipulate on IP addresses
        'setuptools', # namespaces
        'inotifyx', # to watch filesystem changes (used in lockfile)
+        'lock_file', #another lockfile implementation for multiprocess
        'slapos.core', # uses internally
 #        'slapos.toolbox', # needed for libcloud, cloudmgr, disabled for now
        'xml_marshaller', # need to communication with slapgrid
@@ -71,10 +72,15 @@ setup(name=name,
          'agent = slapos.recipe.agent:Recipe',
          'apache.frontend = slapos.recipe.apache_frontend:Recipe',
          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
-          'apacheperl = slapos.recipe.apacheperl:Recipe', 
+          'apacheperl = slapos.recipe.apacheperl:Recipe',
          'apachephp = slapos.recipe.apachephp:Recipe',
          'apachephpconfigure = slapos.recipe.apachephpconfigure:Recipe',
          'apacheproxy = slapos.recipe.apacheproxy:Recipe',
+          'boinc = slapos.recipe.boinc:Recipe',
+          'boinc.app = slapos.recipe.boinc:App',
+          'boinc.client = slapos.recipe.boinc:Client',
+          'bonjourgrid = slapos.recipe.bonjourgrid:Recipe',
+          'bonjourgrid.client = slapos.recipe.bonjourgrid:Client',
          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
          'certificate_authority.request = slapos.recipe.certificate_authority:Request',
          'check_page_content = slapos.recipe.check_page_content:Recipe',
@@ -82,6 +88,8 @@ setup(name=name,
          'check_url_available = slapos.recipe.check_url_available:Recipe',
          'cloud9 = slapos.recipe.cloud9:Recipe',
          'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
+          'condor = slapos.recipe.condor:Recipe',
+          'condor.submit = slapos.recipe.condor:AppSubmit',
          'configurationfile = slapos.recipe.configurationfile:Recipe',
          'cron = slapos.recipe.dcron:Recipe',
          'cron.d = slapos.recipe.dcron:Part',
@@ -159,6 +167,7 @@ setup(name=name,
          'publishurl = slapos.recipe.publishurl:Recipe',
          'pwgen = slapos.recipe.pwgen:Recipe',
          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
+          'redis.server = slapos.recipe.redis:Recipe',
          'request = slapos.recipe.request:Recipe',
          'request.serialised = slapos.recipe.request:Serialised',
          'request.edge = slapos.recipe.request:RequestEdge',
@@ -186,6 +195,7 @@ setup(name=name,
          'stunnel = slapos.recipe.stunnel:Recipe',
          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
          'tidstorage = slapos.recipe.tidstorage:Recipe',
+          'trac = slapos.recipe.trac:Recipe',
          'urlparse = slapos.recipe._urlparse:Recipe',
          'uuid = slapos.recipe._uuid:Recipe',
          'vifib = slapos.recipe.vifib:Recipe',
@@ -203,3 +213,4 @@ setup(name=name,
        ],
      },
    )
+
--- a/slapos/recipe/apachephp/__init__.py
+++ b/slapos/recipe/apachephp/__init__.py
@@ -33,6 +33,27 @@ from slapos.recipe.librecipe import GenericBaseRecipe

 class Recipe(GenericBaseRecipe):

+  def __init__(self, buildout, name, options):
+    self.environ = {}
+
+    environment_section = options.get('environment-section', '').strip()
+    if environment_section and environment_section in buildout:
+      # Use environment variables from the designated config section.
+      self.environ.update(buildout[environment_section])
+    for variable in options.get('environment', '').splitlines():
+      if variable.strip():
+        try:
+          key, value = variable.split('=', 1)
+          self.environ[key.strip()] = value
+        except ValueError:
+          raise zc.buildout.UserError('Invalid environment variable definition: %s', variable)
+    # Extrapolate the environment variables using values from the current
+    # environment.
+    for key in self.environ:
+      self.environ[key] = self.environ[key] % os.environ
+
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
  def install(self):
    path_list = []

@@ -54,21 +75,22 @@ class Recipe(GenericBaseRecipe):
    path_list.append(php_ini)

    # Install apache
-    apache_config = dict(
-      pid_file=self.options['pid-file'],
-      lock_file=self.options['lock-file'],
-      ip=self.options['ip'],
-      port=self.options['port'],
-      error_log=self.options['error-log'],
-      access_log=self.options['access-log'],
-      document_root=self.options['htdocs'],
-      php_ini_dir=self.options['php-ini-dir'],
-    )
-    httpd_conf = self.createFile(self.options['httpd-conf'],
-      self.substituteTemplate(self.getTemplateFilename('apache.in'),
-                              apache_config)
-    )
-    path_list.append(httpd_conf)
+    if self.optionIsTrue('default-conf', True):
+      apache_config = dict(
+        pid_file=self.options['pid-file'],
+        lock_file=self.options['lock-file'],
+        ip=self.options['ip'],
+        port=self.options['port'],
+        error_log=self.options['error-log'],
+        access_log=self.options['access-log'],
+        document_root=self.options['htdocs'],
+        php_ini_dir=self.options['php-ini-dir'],
+      )
+      httpd_conf = self.createFile(self.options['httpd-conf'],
+        self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                                apache_config)
+      )
+      path_list.append(httpd_conf)

    wrapper = self.createWrapper(name=self.options['wrapper'],
                                 command=self.options['httpd-binary'],
@@ -76,7 +98,8 @@ class Recipe(GenericBaseRecipe):
                                     '-f',
                                     self.options['httpd-conf'],
                                     '-DFOREGROUND'
-                                     ])
+                                     ],
+                                 environment=self.environ)
    path_list.append(wrapper)

    secret_key_filename = os.path.join(self.buildout['buildout']['directory'],

--- a/slapos/recipe/boinc/__init__.py
+++ b/slapos/recipe/boinc/__init__.py
+##############################################################################
+#
+# Copyright (c) 2010 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 os
+import subprocess
+import pwd
+import json
+import signal
+import zc.buildout
+
+class Recipe(GenericBaseRecipe):
+  """Deploy a fully operational boinc architecture."""
+
+  def __init__(self, buildout, name, options):
+    #get current slapuser name
+    stat_info = os.stat(options['home'].strip())
+    options['user'] = pwd.getpwuid(stat_info.st_uid)[0]
+    url_base = options['url-base']
+    project = options['project'].strip()
+    root = options['installroot'].strip()
+    options['home_page'] = url_base + "/" + project
+    options['admin_page'] = url_base + "/" + project + "_ops/"
+    options['cronjob'] = os.path.join(root, project+'.cronjob')
+
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def _options(self, options):
+    #Path of boinc compiled package
+    self.package = options['boinc'].strip()
+    self.sourcedir = options['source'].strip()
+    self.home = options['home'].strip()
+    self.project = options['project'].strip()
+    self.fullname = options['fullname'].strip()
+    self.copyright = options['copyright'].strip()
+    self.installroot = options['installroot'].strip()
+    self.boinc_egg = os.path.join(self.package, 'lib/python2.7/site-packages')
+    self.developegg = options['develop-egg'].strip()
+    self.wrapperdir = options['wrapper-dir'].strip()
+    self.passwd = options['passwd'].strip()
+    #Get binary path
+    self.svn = options['svn-binary'].strip()
+    self.perl = options['perl-binary'].strip()
+    self.pythonbin = options['python-binary'].strip()
+
+    #Apache php informations
+    self.url_base =options['url-base'].strip()
+    self.htpasswd = options['htpasswd'].strip()
+    self.phpini = options['php-ini'].strip()
+    self.phpbin = options['php-bin'].strip()
+
+    #get Mysql parameters
+    self.username = options['mysql-username'].strip()
+    self.password = options['mysql-password'].strip()
+    self.database = options['mysql-database'].strip()
+    self.mysqlhost = options['mysql-host'].strip()
+    self.mysqlport = options['mysql-port'].strip()
+
+  def haschanges(self):
+    config_file = os.path.join(self.home, '.config')
+    current = [self.fullname, self.copyright,
+        self.password, self.mysqlhost, self.installroot,
+        self.project, self.passwd, self.url_base]
+    previous = []
+    result = False
+    if os.path.exists(config_file):
+      previous = open(config_file, 'r').read().split('#')
+    #Check if config has changed
+    if len(current) != len(set(current).intersection(set(previous))) or \
+        not os.path.exists(self.installroot) or \
+        not os.path.exists(os.path.join(self.home, '.start_service')):
+      result = True
+    open(config_file, 'w').write('#'.join(current))
+    return result
+
+  def install(self):
+    path_list = []
+    make_project = os.path.join(self.package, 'bin/make_project')
+    niceprojectname = self.project + "@Home"
+    slapuser = self.options['user']
+
+    #Check if given URL is not empty (case of URL request with frontend)
+    if not self.url_base:
+      raise Exception("URL_BASE is still empty. Can not use it")
+
+    #Define environment variable here
+    python = os.path.join(self.home, 'bin/python')
+    python_path = self.boinc_egg
+    if not os.path.exists(python):
+      os.symlink(self.pythonbin, python)
+    for f in os.listdir(self.developegg):
+      dir = os.path.join(self.developegg, f)
+      if os.path.isdir(dir):
+        python_path += ":" + dir
+    bin_dir = os.path.join(self.home, 'bin')
+    environment = dict(
+        PATH=os.pathsep.join([self.svn, bin_dir, self.perl, os.environ['PATH']]),
+        PYTHONPATH=os.pathsep.join([python_path, os.environ['PYTHONPATH']]),
+    )
+
+    #Generate wrapper for php
+    wrapperphp = os.path.join(self.home, 'bin/php')
+    php_wrapper = self.createPythonScript(wrapperphp,
+        'slapos.recipe.librecipe.execute.executee',
+        ([self.phpbin, '-c', self.phpini], os.environ)
+    )
+    path_list.append(php_wrapper)
+
+    #Generate python script for MySQL database test (starting)
+    file_status = os.path.join(self.home, '.boinc_config')
+    if os.path.exists(file_status):
+      os.unlink(file_status)
+    mysql_wrapper = self.createPythonScript(
+      os.path.join(self.wrapperdir, 'start_config'),
+      '%s.configure.checkMysql' % __name__,
+      dict(mysql_port=self.mysqlport, mysql_host=self.mysqlhost,
+          mysql_user=self.username, mysql_password=self.password,
+          database=self.database,
+          file_status=file_status, environment=environment
+      )
+    )
+
+    # Generate make project wrapper file
+    readme_file = os.path.join(self.installroot, self.project+'.readme')
+    launch_args = [make_project, '--url_base', self.url_base, "--db_name",
+              self.database, "--db_user", self.username, "--db_passwd",
+              self.password, "--project_root", self.installroot, "--db_host",
+              self.mysqlhost, "--user_name", slapuser, "--srcdir",
+              self.sourcedir, "--no_query"]
+    drop_install = self.haschanges()
+    request_make_boinc = os.path.join(self.home, '.make_project')
+    if drop_install:
+      #Allow to restart Boinc installation from the begining
+      launch_args += ["--delete_prev_inst", "--drop_db_first"]
+      open(request_make_boinc, 'w').write('Make Requested')
+      if os.path.exists(readme_file):
+        os.unlink(readme_file)
+    launch_args += [self.project, niceprojectname]
+
+    install_wrapper = self.createPythonScript(
+      os.path.join(self.wrapperdir, 'make_project'),
+      '%s.configure.makeProject' % __name__,
+      dict(launch_args=launch_args, request_file=request_make_boinc,
+      make_sig=file_status, env=environment)
+    )
+    path_list.append(install_wrapper)
+
+    #generate sh script for project configuration
+    bash = os.path.join(self.home, 'bin', 'project_config.sh')
+    sh_script = self.createFile(bash,
+        self.substituteTemplate(self.getTemplateFilename('project_config.in'),
+        dict(dash=self.options['dash'].strip(),
+              uldl_pid=self.options['apache-pid'].strip(),
+              user=slapuser, fullname=self.fullname,
+              copyright=self.copyright, installroot=self.installroot))
+    )
+    path_list.append(sh_script)
+    os.chmod(bash , 0700)
+
+    #After make_project run configure_script to perform and restart apache php services
+    service_status = os.path.join(self.home, '.start_service')
+    parameter = dict(
+        readme=readme_file,
+        htpasswd=self.htpasswd,
+        installroot=self.installroot,
+        username=slapuser,
+        passwd=self.passwd,
+        xadd=os.path.join(self.installroot, 'bin/xadd'),
+        environment=environment,
+        service_status=service_status,
+        drop_install=drop_install,
+        sedconfig=bash
+    )
+    start_service = self.createPythonScript(
+      os.path.join(self.wrapperdir, 'config_project'),
+      '%s.configure.services' % __name__, parameter
+    )
+    path_list.append(start_service)
+
+    #Generate Boinc start project wrapper
+    start_args = [os.path.join(self.installroot, 'bin/start')]
+    start_boinc = os.path.join(self.home, '.start_boinc')
+    if os.path.exists(start_boinc):
+      os.unlink(start_boinc)
+    boinc_parameter = dict(service_status=service_status,
+        installroot=self.installroot, drop_install=drop_install,
+        mysql_port=self.mysqlport, mysql_host=self.mysqlhost,
+        mysql_user=self.username, mysql_password=self.password,
+        database=self.database, environment=environment,
+        start_boinc=start_boinc)
+    start_wrapper = self.createPythonScript(os.path.join(self.wrapperdir,
+        'start_boinc'),
+        '%s.configure.restart_boinc' % __name__,
+        boinc_parameter
+    )
+    path_list.append(start_wrapper)
+
+    return path_list
+
+  update = install
+
+
+class App(GenericBaseRecipe):
+  """This recipe allow to deploy an scientific applications using boinc
+  Note that recipe use depend on boinc-server parameter"""
+
+  def downloadFiles(self, app):
+    """This is used to download app files if necessary and update options values"""
+    for key in ('input-file', 'template-result', 'template-wu', 'binary'):
+      param = app[key]
+      if param and (param.startswith('http') or param.startswith('ftp')):
+        #download the specified file
+        cache = os.path.join(self.options['home'].strip(), 'tmp')
+        downloader = zc.buildout.download.Download(self.buildout['buildout'],
+                        hash_name=True, cache=cache)
+        path, _ = downloader(param, md5sum=None)
+        mode = 0600
+        if key == 'binary':
+          mode = 0700
+        os.chmod(path, mode)
+        app[key] = path
+
+  def getAppList(self):
+    """Load parameters,
+      check if parameter send is valid to install or update application"""
+    app_list = json.loads(self.options['boinc-app-list'])
+    if not app_list:
+      return None
+    default_template_result = self.options.get('default-template-result', '').strip()
+    default_template_wu = self.options.get('default-template-wu', '').strip()
+    default_extension = self.options.get('default-extension', '').strip()
+    default_platform = self.options.get('default-platform', '').strip()
+    for app in app_list:
+      for version in app_list[app]:
+        current_app = app_list[app][version]
+        #Use default value if empty and Use_default is True
+        #Initialize all values to empty if not define by the user
+        if current_app['use_default']:
+          current_app['template-result'] = current_app.get('template-result',
+                        default_template_result).strip()
+          current_app['template-wu'] = current_app.get('template-wu',
+                        default_template_wu).strip()
+          current_app['extension'] = current_app.get('extension',
+                        default_extension).strip()
+          current_app['platform'] = current_app.get('platform',
+                        default_platform).strip()
+        else:
+          current_app['template-result'] = current_app.get('template-result', '').strip()
+          current_app['template-wu'] = current_app.get('template-wu', '').strip()
+          current_app['extension'] = current_app.get('extension', '').strip()
+          current_app['platform'] = current_app.get('platform', '').strip()
+        current_app['input-file'] = current_app.get('input-file', '').strip()
+        current_app['wu-number'] = current_app.get('wu-number', 1)
+        #for new application, check if parameter is complete
+        appdir = os.path.join(self.options['installroot'].strip(), 'apps',
+                        app, version)
+        if not os.path.exists(appdir):
+          if not current_app['template-result'] or not current_app['binary'] \
+              or not current_app['input-file'] or not current_app['template-wu'] \
+              or not current_app['platform']:
+            print "BOINC-APP: ERROR - Invalid argements values for % ...operation cancelled" % app
+            app_list[app][version] = None
+            continue
+        #write application to install
+        request_file = os.path.join(self.options['home'].strip(),
+                            '.install_' + app + version)
+        toInstall = open(request_file, 'w')
+        toInstall.write('install or update')
+        toInstall.close()
+    return app_list
+
+  def install(self):
+
+    app_list = self.getAppList()
+
+    path_list = []
+    package = self.options['boinc'].strip()
+    #Define environment variable here
+    developegg = self.options['develop-egg'].strip()
+    python_path = os.path.join(package, 'lib/python2.7/site-packages')
+    home = self.options['home'].strip()
+    user = pwd.getpwuid(os.stat(home).st_uid)[0]
+    perl = self.options['perl-binary'].strip()
+    svn = self.options['svn-binary'].strip()
+    for f in os.listdir(developegg):
+      dir = os.path.join(developegg, f)
+      if os.path.isdir(dir):
+        python_path += ":" + dir
+    bin_dir = os.path.join(home, 'bin')
+    environment = dict(
+        PATH=os.pathsep.join([svn, bin_dir, perl, os.environ['PATH']]),
+        PYTHONPATH=os.pathsep.join([python_path, os.environ['PYTHONPATH']]),
+    )
+
+    #generate project.xml and config.xml script updater
+    bash = os.path.join(home, 'bin', 'update_config.sh')
+    sh_script = self.createFile(bash,
+        self.substituteTemplate(self.getTemplateFilename('sed_update.in'),
+        dict(dash=self.options['dash'].strip()))
+    )
+    path_list.append(sh_script)
+    os.chmod(bash , 0700)
+
+    #If useful, download necessary files and update options path
+    start_boinc = os.path.join(home, '.start_boinc')
+    installroot = self.options['installroot'].strip()
+    apps_dir = os.path.join(installroot, 'apps')
+    wrapperdir = self.options['wrapper-dir'].strip()
+    project = self.options['project'].strip()
+    lockfile = os.path.join(self.options['home'].strip(), 'app_install.lock')
+    fd = os.open(lockfile, os.O_RDWR|os.O_CREAT)
+    os.close( fd )
+
+    for appname in app_list:
+      for version in app_list[appname]:
+        if not app_list[appname][version]:
+          continue
+        self.downloadFiles(app_list[appname][version])
+        platform = app_list[appname][version]['platform']
+        application = os.path.join(apps_dir, appname, version, platform)
+        if app_list[appname][version]['binary'] and not platform:
+          print "BOINC-APP: WARNING - Cannot specify binary without giving platform value"
+          app_list[appname][version]['binary'] = '' #Binary will not be updated
+
+        parameter = dict(installroot=installroot,
+                appname=appname, project=project,
+                version=version, platform=platform,
+                application=application, environment=environment,
+                start_boinc=start_boinc,
+                wu_number=app_list[appname][version]['wu-number'],
+                t_result=app_list[appname][version]['template-result'],
+                t_wu=app_list[appname][version]['template-wu'],
+                t_input=app_list[appname][version]['input-file'],
+                binary=app_list[appname][version]['binary'],
+                extension=app_list[appname][version]['extension'],
+                bash=bash, home_dir=home,
+                lockfile=lockfile,
+        )
+        deploy_app = self.createPythonScript(
+          os.path.join(wrapperdir, 'boinc_%s' % appname),
+          '%s.configure.deployApp' % __name__, parameter
+        )
+        path_list.append(deploy_app)
+
+    return path_list
+
+  update = install
+
+class Client(GenericBaseRecipe):
+  """Deploy a fully fonctionnal boinc client connected to a boinc server instance"""
+
+  def __init__(self, buildout, name, options):
+    #get current uig to create a unique rpc-port for this client
+    stat_info = os.stat(options['home'].strip())
+    options['rpc-port'] = pwd.getpwuid(stat_info.st_uid)[2] + 5000
+
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    path_list = []
+    boincbin = self.options['boinc-bin'].strip()
+    cmdbin = self.options['cmd-bin'].strip()
+    installdir = self.options['install-dir'].strip()
+    url = self.options['server-url'].strip()
+    key = self.options['key'].strip()
+    boinc_wrapper = self.options['client-wrapper'].strip()
+    cmd_wrapper = self.options['cmd-wrapper'].strip()
+    remote_host = os.path.join(installdir, 'remote_hosts.cfg')
+    open(remote_host, 'w').write(self.options['ip'].strip())
+
+    #Generate wrapper for boinc cmd
+    base_cmd = [cmdbin, '--host', str(self.options['rpc-port']),
+                      '--passwd', self.options['passwd'].strip()]
+    cc_cmd = ''
+    if self.options['cconfig'].strip() != '':
+      config_dest = os.path.join(installdir, 'cc_config.xml')
+      file = open(config_dest, 'w')
+      file.write(open(self.options['cconfig'].strip(), 'r').read())
+      file.close()
+      cc_cmd = '--read_cc_config'
+    cmd = self.createPythonScript(cmd_wrapper,
+        '%s.configure.runCmd' % __name__,
+        dict(base_cmd=base_cmd, cc_cmd=cc_cmd, installdir=installdir,
+        project_url=url, key=key)
+    )
+    path_list.append(cmd)
+
+    #Generate BOINC client wrapper
+    boinc = self.createPythonScript(boinc_wrapper,
+            'slapos.recipe.librecipe.execute.execute',
+            [boincbin, '--allow_multiple_clients', '--gui_rpc_port',
+              str(self.options['rpc-port']), '--allow_remote_gui_rpc',
+              '--dir', installdir, '--redirectio', '--check_all_logins']
+    )
+    path_list.append(boinc)
+
+    return path_list
--- a/slapos/recipe/boinc/configure.py
+++ b/slapos/recipe/boinc/configure.py
+##############################################################################
+#
+# Copyright (c) 2010 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 os
+import sys
+import subprocess
+import time
+import shutil
+import re
+import filecmp
+
+from lock_file import LockFile
+
+def checkMysql(args):
+  sys.path += args['environment']['PYTHONPATH'].split(':')
+  import MySQLdb
+  #Sleep until mysql server becomes available
+  while True:
+    try:
+      conn = MySQLdb.connect(host = args['mysql_host'],
+                          user = args['mysql_user'],
+                          port = int(args['mysql_port']),
+                          passwd = args['mysql_password'],
+                          db = args['database'])
+      conn.close()
+      print "Successfully connect to MySQL database... "
+      if args.has_key('file_status'):
+        writeFile(args['file_status'], "starting")
+      break
+    except Exception, ex:
+      print "The result is: \n" + ex.message
+      print "Could not connect to MySQL database... sleep for 2 secondes"
+      time.sleep(2)
+
+
+def checkFile(file, stime):
+  """Loop until 'file' is created (exist)"""
+  while True:
+    print "Search for file %s..." % file
+    if not os.path.exists(file):
+      print "File not found... sleep for %s secondes" % stime
+      time.sleep(stime)
+    else:
+      break
+
+
+def restart_boinc(args):
+  """Stop (if currently is running state) and start all Boinc service"""
+  if args['drop_install']:
+    checkFile(args['service_status'], 3)
+  else:
+    checkMysql(args)
+  print "Restart Boinc..."
+  env = os.environ
+  env['PATH'] = args['environment']['PATH']
+  env['PYTHONPATH'] = args['environment']['PYTHONPATH']
+  binstart = os.path.join(args['installroot'], 'bin/start')
+  binstop = os.path.join(args['installroot'], 'bin/stop')
+  os.system(binstop)
+  os.system(binstart)
+  writeFile(args['start_boinc'], "started")
+  print "Done."
+
+
+def check_installRequest(args):
+  print "Cheking if needed to install %s..." % args['appname']
+  install_request_file = os.path.join(args['home_dir'],
+                  '.install_' + args['appname'] + args['version'])
+  if not os.path.exists(install_request_file):
+    print "No install or update request for %s version %s..." % (
+                args['appname'], args['version'])
+    return False
+  os.unlink(install_request_file)
+  return True
+
+def copy_file(source, dest):
+  """"Copy file with source to dest with auto replace
+      return True if file has been copied and dest ha been replaced
+  """
+  result = False
+  if source and os.path.exists(source):
+    if os.path.exists(dest):
+      if filecmp.cmp(dest, source):
+        return False
+      os.unlink(dest)
+    result = True
+    shutil.copy(source, dest)
+  return result
+
+
+def startProcess(launch_args, env=None, cwd=None, stdout=subprocess.PIPE):
+  process = subprocess.Popen(launch_args, stdout=stdout,
+              stderr=subprocess.STDOUT, env=env,
+              cwd=cwd)
+  result = process.communicate()[0]
+  if process.returncode is None or process.returncode != 0:
+    print "Failed to execute executable.\nThe error was: %s" % result
+    return False
+  return True
+
+def makeProject(args):
+  """Run BOINC make_project script but once only"""
+  #Wait for DateBase initialization...
+  checkFile(args['make_sig'], 3)
+  print "Cheking if needed to run BOINC make_project..."
+  if os.path.exists(args['request_file']):
+    env = os.environ
+    env['PATH'] = args['env']['PATH']
+    env['PYTHONPATH'] = args['env']['PYTHONPATH']
+    if startProcess(args['launch_args'], env=env):
+      os.unlink(args['request_file'])
+    print "Finished running BOINC make_projet...Ending"
+  else:
+    print "No new request for make_project. Exiting..."
+
+
+def services(args):
+  """This function configure a new installed boinc project instance"""
+  print "Checking if needed to install or reinstall Boinc-server..."
+  if not args['drop_install']:
+    print "Not need to install Boinc-server...skipped"
+    return
+  #Sleep until file 'boinc_project'.readme exist
+  checkFile(args['readme'], 3)
+
+  topath = os.path.join(args['installroot'], 'html/ops/.htpasswd')
+  print "Generating .htpasswd file... File=%s" % topath
+  passwd = open(args['passwd'], 'r').read()
+  htpwd_args = [args['htpasswd'], '-b', '-c', topath, args['username'], passwd]
+  if not startProcess(htpwd_args):
+    return
+
+  print "execute script xadd..."
+  env = os.environ
+  env['PATH'] = args['environment']['PATH']
+  env['PYTHONPATH'] = args['environment']['PYTHONPATH']
+  if not startProcess([os.path.join(args['installroot'], 'bin/xadd')], env):
+    return
+  print "Update files and directories permissions..."
+  upload = os.path.join(args['installroot'], 'upload')
+  inc = os.path.join(args['installroot'], 'html/inc')
+  languages = os.path.join(args['installroot'], 'html/languages')
+  compiled = os.path.join(args['installroot'], 'html/languages/compiled')
+  user_profile = os.path.join(args['installroot'], 'html/user_profile')
+  forum_file = os.path.join(args['installroot'], 'html/ops/create_forums.php')
+  project_inc = os.path.join(args['installroot'], 'html/project/project.inc')
+  cmd = "chmod 02700 -R %s %s, %s %s %s" % (upload, inc,
+              languages, compiled, user_profile)
+  os.system("chmod g+w -R " + args['installroot'])
+  os.system(cmd)
+  os.system("chmod o+x " + inc)
+  os.system("chmod -R o+r " + inc)
+  os.system("chmod o+x " + languages)
+  os.system("chmod o+x " + compiled)
+  sed_args = [args['sedconfig']]
+  startProcess(sed_args)
+
+  #Execute php create_forum.php...
+  print "Boinc Forum: Execute php create_forum.php..."
+  cwd = os.path.join(args['installroot'], 'html/ops')
+  if not startProcess(["php", forum_file], env, cwd):
+    return
+
+  writeFile(args['service_status'], "started")
+
+def deployApp(args):
+  """Deploy Boinc App with lock"""
+  print "Asking to enter in execution with lock mode..."
+  with LockFile(args['lockfile'], wait=True):
+    print "acquire the lock file..."
+    deployManagement(args)
+  print "Exit execution with lock..."
+
+def deployManagement(args):
+  """Fully deploy or redeploy or update a BOINC application using existing BOINC instance"""
+  if not check_installRequest(args):
+    return
+  token = os.path.join(args['installroot'], "." + args['appname'] + args['version'])
+  newInstall = False
+  if os.path.exists(token):
+    args['previous_wu'] = int(open(token, 'r').read().strip())
+    if args['previous_wu'] < args['wu_number']:
+      print args['appname'] + " Work units will be updated from %s to %s" % (
+                args['previous_wu'], args['wu_number'])
+  else:
+    args['previous_wu'] = 0
+    newInstall = True
+  #Sleep until file .start_boinc exist (File indicate that BOINC has been started)
+  checkFile(args['start_boinc'], 3)
+  env = os.environ
+  env['PATH'] = args['environment']['PATH']
+  env['PYTHONPATH'] = args['environment']['PYTHONPATH']
+
+  print "setup directories..."
+  numversion = args['version'].replace('.', '')
+  args['inputfile'] = os.path.join(args['installroot'], 'download',
+                        args['appname'] + numversion + '_input')
+  base_app = os.path.join(args['installroot'], 'apps', args['appname'])
+  base_app_version = os.path.join(base_app, args['version'])
+  args['templates'] = os.path.join(args['installroot'], 'templates')
+  t_result = os.path.join(args['templates'],
+                          args['appname'] + numversion + '_result')
+  t_wu = os.path.join(args['templates'],
+                          args['appname'] + numversion + '_wu')
+  binary_name = args['appname'] +"_"+ args['version'] +"_"+ \
+          args['platform'] +  args['extension']
+  binary = os.path.join(args['application'], binary_name)
+  signBin = False
+  if not os.path.exists(base_app):
+    os.mkdir(base_app)
+  if newInstall:
+    if os.path.exists(base_app_version):
+      shutil.rmtree(base_app_version)
+    os.mkdir(base_app_version)
+    os.mkdir(args['application'])
+  if not os.path.exists(args['templates']):
+    os.mkdir(args['templates'])
+  copy_file(args['t_result'], t_result)
+  copy_file(args['t_wu'], t_wu)
+  signBin = copy_file(args['binary'], binary)
+  if args['t_input']:
+    if os.path.exists(args['inputfile']):
+      os.unlink(args['inputfile'])
+    os.symlink(args['t_input'], args['inputfile'])
+
+  project_xml = os.path.join(args['installroot'], 'project.xml')
+  findapp = re.search("<name>(%s)</name>" % args['appname'],
+                open(project_xml, 'r').read())
+  if not findapp:
+    print "Adding '" + args['appname'] + "' to project.xml..."
+    print "Adding deamon for application to config.xml..."
+    sed_args = [args['bash'], args['appname'], args['installroot']]
+    startProcess(sed_args)
+
+  if signBin:
+    print "Sign the application binary..."
+    sign = os.path.join(args['installroot'], 'bin/sign_executable')
+    privateKeyFile = os.path.join(args['installroot'], 'keys/code_sign_private')
+    output = open(binary + '.sig', 'w')
+    p_sign = subprocess.Popen([sign, binary, privateKeyFile], stdout=output,
+            stderr=subprocess.STDOUT)
+    result = p_sign.communicate()[0]
+    if p_sign.returncode is None or p_sign.returncode != 0:
+      print "Failed to execute bin/sign_executable.\nThe error was: %s" % result
+      return
+    output.close()
+
+  print "execute script xadd..."
+
+  if not startProcess([os.path.join(args['installroot'], 'bin/xadd')], env):
+    return
+  print "Running script bin/update_versions..."
+  updt_version = os.path.join(args['installroot'], 'bin/update_versions')
+  p_version = subprocess.Popen([updt_version], stdout=subprocess.PIPE,
+          stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env,
+          cwd=args['installroot'])
+  p_version.stdin.write('y\ny\n')
+  result = p_version.communicate()[0]
+  p_version.stdin.close()
+  if p_version.returncode is None or p_version.returncode != 0:
+    print "Failed to execute bin/update_versions.\nThe error was: %s" % result
+    return
+
+  print "Fill the database... calling bin/create_work..."
+  create_wu(args, env)
+
+  print "Restart Boinc..."
+  binstart = os.path.join(args['installroot'], 'bin/start')
+  binstop = os.path.join(args['installroot'], 'bin/stop')
+  os.system(binstop)
+  os.system(binstart)
+
+  print "Boinc Application deployment is done... writing end signal file..."
+  writeFile(token, str(args['wu_number']))
+
+
+def create_wu(args, env):
+  """Create or update number of work unit for an existing boinc application"""
+  numversion = args['version'].replace('.', '')
+  t_result = "templates/" + args['appname'] + numversion + '_result'
+  t_wu = "templates/" + args['appname'] + numversion + '_wu'
+  launch_args = [os.path.join(args['installroot'], 'bin/create_work'),
+        '--appname', args['appname'], '--wu_name', '',
+        '--wu_template', t_wu, '--result_template', t_result,
+        '--min_quorum', '1',  '--target_nresults', '1',
+        args['appname'] + numversion + '_input']
+  for i in range(args['previous_wu'], args['wu_number']):
+    print "Creating project wroker %s..." % str(i+1)
+    launch_args[4] = args['appname'] + str(i+1) + numversion + '_nodelete'
+    startProcess(launch_args, env, args['installroot'])
+
+
+def runCmd(args):
+  """Wait for Boinc Client started and run boinc cmd"""
+  client_config = os.path.join(args['installdir'], 'client_state.xml')
+  checkFile(client_config, 5)
+  time.sleep(10)
+  #Scan client state xml to find client ipv4 adress
+  host = re.search("<ip_addr>([\w\d\.:]+)</ip_addr>",
+                open(client_config, 'r').read()).group(1)
+  args['base_cmd'][2] = host + ':' + args['base_cmd'][2]
+  print "Run boinccmd with host at %s " % args['base_cmd'][2]
+  project_args = args['base_cmd'] + ['--project_attach', args['project_url'],
+                      args['key']]
+  startProcess(project_args, cwd=args['installdir'])
+  if args['cc_cmd'] != '':
+    #Load or reload cc_config file
+    startProcess(args['base_cmd'] + [args['cc_cmd']], cwd=args['installdir'])
+
+
+def writeFile(file, content):
+  f = open(file, 'w')
+  f.write(content)
+  f.close()
--- a/slapos/recipe/boinc/template/project_config.in
+++ b/slapos/recipe/boinc/template/project_config.in
+#!%(dash)s
+
+sed -i "/remove the die/d" %(installroot)s/html/ops/create_forums.php
+sed -i "s#REPLACE WITH PROJECT NAME#%(fullname)s#" %(installroot)s/html/project/project.inc
+sed -i "s#REPLACE WITH COPYRIGHT HOLDER#%(copyright)s#" %(installroot)s/html/project/project.inc
+sed -i.old -e "/<\/config>/i\<uldl_pid>%(uldl_pid)s</uldl_pid>" %(installroot)s/config.xml
+sed -i.old -e "/<\/config>/i\<httpd_user>%(user)s</httpd_user>" %(installroot)s/config.xml
--- a/slapos/recipe/boinc/template/sed_update.in
+++ b/slapos/recipe/boinc/template/sed_update.in
+#!%(dash)s
+if [ $# -ne 2 ]
+then
+   echo not enough argument.
+   echo ARGS: appname installroot
+
+else
+
+sed -i.old -e "/<\/boinc>/i\<app>\n<name>$1</name>\n<user_friendly_name>$1</user_friendly_name>\n</app>" $2/project.xml
+
+sed -i.old -e "/<\/daemons>/i\<daemon>\n<cmd>\nsample_bitwise_validator -d 3 -app $1\n</cmd>\n</daemon>" $2/config.xml
+sed -i.old -e "/<\/daemons>/i\<daemon>\n<cmd>\nsample_assimilator -d 3 -app $1\n</cmd>\n</daemon>" $2/config.xml
+
+fi
\ No newline at end of file
--- a/slapos/recipe/bonjourgrid/__init__.py
+++ b/slapos/recipe/bonjourgrid/__init__.py
+##############################################################################
+#
+# Copyright (c) 2010 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 os
+import subprocess
+import pwd
+import signal
+import zc.buildout
+
+class Recipe(GenericBaseRecipe):
+  """Deploy a fully operational BonjourGrid Master architecture."""
+
+
+  def install(self):
+    path_list = []
+    condor_wrapper = self.options['condor-wrapper'].strip()
+    boinc_wrapper = self.options['boinc-wrapper'].strip()
+    startCondor = startBoinc = False
+    condor_wrapper_list = []
+    boinc_wrapper_list = []
+    for file in os.listdir(condor_wrapper):
+      condor_wrapper_list.append(os.path.join(condor_wrapper, file))
+    for file in os.listdir(boinc_wrapper):
+      boinc_wrapper_list.append(os.path.join(boinc_wrapper, file))
+
+    type = self.options['type'].strip()
+    if type == "condor":
+      startCondor = True
+      project = self.options['condor_host'].strip()
+    if type == "boinc":
+      project = self.options['url-boinc'].strip()
+      startBoinc = True
+
+    #Generate BOINC/Condor launcher script
+    grid_wrapper = self.options['boinc_condor_wrapper'].strip()
+    parameters = dict(startCondor=startCondor, startBoinc=startBoinc,
+                      bg_base=self.options['work_dir'].strip(),
+                      condor_wrapper_list=condor_wrapper_list,
+                      boinc_wrapper_list=boinc_wrapper_list)
+    bonjourGrid_wrapper = self.createPythonScript(grid_wrapper,
+        '%s.configure.launchScript' % __name__,
+        parameters
+    )
+    path_list.append(bonjourGrid_wrapper)
+
+    #Generate wrapper for BonjourGrid Master
+    bonjourgrid_master = self.options['master_script'].strip()
+    python = self.options['python-bin'].strip()
+    bg_wrapper = self.options['wrapper'].strip()
+    log = self.options['log_file'].strip()
+    pid_file = self.options['pid_file'].strip()
+    wrapper = self.createPythonScript(bg_wrapper,
+        'slapos.recipe.librecipe.execute.execute',
+        ([python, bonjourgrid_master, '--log_file', log,
+          '--pid_file', pid_file,
+          '--master_wrapper', grid_wrapper,
+          '--directory', self.options['work_dir'].strip(),
+          '--server', self.options['redis-url'].strip(),
+          '--port', self.options['redis-port'].strip(),
+          '--num_workers', self.options['nworkers'].strip(),
+        ])
+    )
+    path_list.append(wrapper)
+
+
+    #generate Computer information file
+    config_info_file = os.path.join(self.options['work_dir'].strip(),
+                                'machineinfo.sh')
+    config_info = self.createFile(config_info_file,
+      self.substituteTemplate(self.getTemplateFilename('machineinfo.sh.in'),
+      dict(ip_address=self.options['ipv6'].strip(),
+            project=project,
+            middleware=type)))
+    os.chmod(config_info_file, 0744)
+    path_list.append(config_info)
+
+  update = install
+
+class Client(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+    boinc_script = self.options['boinc_script'].strip()
+    condor_script = self.options['condor_script'].strip()
+
+    #Generate wrapper for BonjourGrid Worker
+    bonjourgrid_client = self.options['client_script'].strip()
+    python = self.options['python-bin'].strip()
+    bg_wrapper = self.options['wrapper'].strip()
+    log = self.options['log_file'].strip()
+    pid_file = self.options['pid_file'].strip()
+    wrapper = self.createPythonScript(bg_wrapper,
+        'slapos.recipe.librecipe.execute.execute',
+        ([python, bonjourgrid_client, '--log_file', log,
+          '--pid_file', pid_file,
+          '--boinc_wrapper', boinc_script,
+          '--condor_wrapper', condor_script,
+          '--directory', self.options['work_dir'].strip(),
+          '--install_directory', self.options['install_dir'].strip(),
+          '--server', self.options['redis-url'].strip(),
+          '--port', self.options['redis-port'].strip(),
+        ])
+    )
+    path_list.append(wrapper)
+
+    #generate BOINC and Condor configure script for bonjourgrid
+    boinc_wrapper = self.createPythonScript(boinc_script,
+        '%s.boinc.runBoinc' % __name__,
+        dict(ipv6=self.options['ipv6'].strip(),
+            email=self.options['email'].strip(),
+            boinc_wrapper=self.options['boinc_wrapper'].strip(),
+            boinc_cmd=self.options['boinc_cmd'].strip(),
+            boinc_rpc_port=self.options['boinc_rpc_port'],
+            boinc_install_dir=self.options['boinc_install_dir'].strip(),
+            boinc_passwd=self.options['boinc_passwd'].strip(),
+            account_name=self.options['account_name'].strip(),
+            account_passwd=self.options['account_passwd'].strip(),
+        )
+    )
+    path_list.append(boinc_wrapper)
+    condor_wrapper = self.createPythonScript(condor_script,
+        '%s.condor.runCondor' % __name__,
+        dict(ipv6=self.options['ipv6'].strip(),
+            condor_bin=self.options['condor_bin'].strip(),
+            condor_sbin=self.options['condor_sbin'].strip(),
+            condor_wrapper=self.options['condor_wrapper'].strip(),
+            condor_config=self.options['condor_config'].strip(),
+            condor_config_local=self.options['condor_config_local'].strip(),
+        )
+    )
+    path_list.append(condor_wrapper)
+
--- a/slapos/recipe/bonjourgrid/boinc.py
+++ b/slapos/recipe/bonjourgrid/boinc.py
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import re
+import subprocess
+import time
+import signal
+
+def startProcess(launch_args, env=None, cwd=None, stdout=subprocess.PIPE):
+  process = subprocess.Popen(launch_args, stdout=stdout,
+              stderr=subprocess.STDOUT, env=env,
+              cwd=cwd)
+  result = process.communicate()[0]
+  if process.returncode is None or process.returncode != 0:
+    raise NameError("Failed to execute executable.\nThe error was: %s" % result)
+
+def joinProject(args, base_cmd):
+  """Finish BOINC Client configuration with create account and attach project"""
+  project_args = base_cmd + ['--project_attach', args['project_url'],
+                      args['key']]
+  startProcess(project_args, cwd=args['boinc_install_dir'])
+
+
+def createAccount(config, base_cmd):
+  """Connect to BOINC Master and create an account
+  """
+  account_args = base_cmd + ['--create_account', config['project_url'],
+                             config['email'], config['account_passwd'],
+                             config['account_name']]
+  startProcess(account_args, cwd=config['boinc_install_dir'])
+  account_file = os.path.join(config['boinc_install_dir'], 'create_account.xml')
+  key = re.search("<authenticator>([\w\d\._]+)</authenticator>",
+                open(account_file, 'r').read()).group(1)
+  return key
+
+def runBoinc(config):
+  if len(sys.argv) < 2:
+    print "Argument Error: uses %s project_url" % sys.argv[0]
+    exit(1)
+  if type(config) == type(""):
+    print "Error: bonjourgrid.xml parsing error, file not exist or corrupted"
+    exit(1)
+  #XXX Using define values here for Boinc Master URL
+  config['project_url'] = sys.argv[1]
+
+  #launch Boinc Client
+  boinc = subprocess.Popen([config['boinc_wrapper']],
+                           stdout=subprocess.PIPE,
+                           stderr=subprocess.STDOUT)
+
+  #Retrieve ipv4 using by Boinc-client in client-configuration
+  client_config = os.path.join(config['boinc_install_dir'], 'client_state.xml')
+  while not os.path.exists(client_config):
+    time.sleep(5)
+    print "Search for file '%r'..." % client_config
+  time.sleep(10)
+  try:
+    #Scan client state xml to find client ipv4 adress
+    host = re.search("<ip_addr>([\w\d\.:]+)</ip_addr>",
+                  open(client_config, 'r').read()).group(1)
+    base_cmd = [config['boinc_cmd'], '--host',
+                host + ":" + str(config['boinc_rpc_port']),
+                '--passwd', config['boinc_passwd']]
+  
+    #Create Account for current instance on BOINC master
+    print "Create account for current client..."
+    key = createAccount(config, base_cmd)
+    config['key'] = key
+    print "Done. The account key is %s" % key
+  
+    #Attach project to Boinc Master
+    print "Attach client to Boinc Master at %s " % config['project_url']
+    try:
+      joinProject(config, base_cmd)
+    except Exception, e:
+      print e
+    print "Done! Waiting for Boinc Client now..."
+  except Exception, e:
+    #An error occure!!!
+    os.kill(boinc.pid, signal.SIGTERM)
+    print e
+  #wait for Boinc client execution
+  boinc.wait()
--- a/slapos/recipe/bonjourgrid/condor.py
+++ b/slapos/recipe/bonjourgrid/condor.py
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import re
+import subprocess
+import time
+
+def writeFile(file, content):
+  f = open(file, 'w')
+  f.write(content)
+  f.close()
+
+def updateCondorConfig(path, path_local, hostname, ipv6):
+  """Replace Static information into condor_config and condor_config.local files"""  
+  #replace condor host into condor_config
+  text = open(path, 'r').read()
+  text = re.sub(r'\[%s\]' % ipv6, hostname, text, flags=re.IGNORECASE)
+  writeFile(path, text)
+  #replace condor host into condor_config.local
+  text = open(path_local, 'r').read()
+  text = re.sub(r'\[%s\]' % ipv6, hostname, text, flags=re.IGNORECASE)
+  writeFile(path_local, text)
+  
+def updateCondorWrapper(folder, hostname, ipv6):
+  """Replace slapos generated value by the true value"""
+  for file in os.listdir(folder):
+    path = os.path.join(folder, file)
+    if os.path.exists(path) and not os.path.isdir(path):
+      text = re.sub(r'\[%s\]' % ipv6, hostname, open(path, 'r').read(),
+                      flags=re.IGNORECASE)
+      writeFile(path, text)
+
+def runCondor(config):
+  if len(sys.argv) < 2:
+    print "Argument Error: uses %s hostname" % sys.argv[0]
+    exit(1)
+    
+  hostname = sys.argv[1]
+  updateCondorConfig(config['condor_config'], config['condor_config_local'],
+              hostname, config['ipv6'])
+  updateCondorWrapper(config['condor_bin'], hostname, config['ipv6'])
+  updateCondorWrapper(config['condor_sbin'], hostname, config['ipv6'])
+    
+  #launch Boinc Client
+  condor = subprocess.Popen([config['condor_wrapper']],
+                           stdout=subprocess.PIPE,
+                           stderr=subprocess.STDOUT)
+  condor.wait()