diff --git a/software/pulse/instance.cfg b/software/pulse/instance.cfg index 9b0c2276294533d3d5a3d613323b894284af9297..087aa5a7a3ca471eacf169e9db14c321aeec11ba 100644 --- a/software/pulse/instance.cfg +++ b/software/pulse/instance.cfg @@ -8,7 +8,12 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} dcrond_binary = ${dcron:location}/sbin/crond -memcached_binary = ${memcached:location}/bin/memcached +httpd_binary = ${apache:location}/bin/httpd +mmc_agent_binary = ${mmc_core:location}/bin/mmc-agent +mysql_binary = ${mysql:location}/bin/mysql +mysql_install_binary = ${mysql:location}/bin/mysql_install_db +mysql_upgrade_binary = ${mysql:location}/bin/mysql_upgrade +mysqld_binary = ${mysql:location}/libexec/mysqld openssl_binary = ${openssl:location}/bin/openssl rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup stunnel_binary = ${stunnel:location}/bin/stunnel diff --git a/software/pulse/software.cfg b/software/pulse/software.cfg index 11b2dfeac2389dd31fd6d73821ac97123c656ddd..83bd9aa00564ec1f5acf00db7fb63b9c362fd265 100644 --- a/software/pulse/software.cfg +++ b/software/pulse/software.cfg @@ -2,13 +2,6 @@ slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook develop = ${:slaposcookbook_recipe_location} -mmc_core_location = ${:parts-directory}/mmc -develop = - ${:mmc_location} -pulse2_location = ${:parts-directory}/pulse2 -develop = - ${:pulse2_location} - extensions = slapos.zcbworkarounds @@ -20,12 +13,14 @@ find-links += extends = ../../component/git/buildout.cfg ../../component/svn/buildout.cfg + ../../component/openssl/buildout.cfg ../../component/openldap/buildout.cfg ../../component/mysql-5.1/buildout.cfg ../../component/dcron/buildout.cfg ../../component/stunnel/buildout.cfg ../../component/rdiff-backup/buildout.cfg ../../component/lxml-python/buildout.cfg + ../../component/apache-php/buildout.cfg #TODO add twisted # Use only quite well working sites. @@ -49,6 +44,8 @@ parts = libxslt eggs instance-recipe-egg + mmc_core + pulse2 # XXX: Workaround of SlapOS limitation # Unzippig of eggs is required, as SlapOS do not yet provide nicely working @@ -66,11 +63,34 @@ section = python2.7 # - [instance-recipe] needs [slaposcookbook] to be finished # - we cannot rely on anything else being executed before [instance-recipe] slaposcookbook_dummy = ${slaposcookbook:location} -mmc_dummy = ${mmc:location} -pulse2_dummy = ${pulse2:location} egg = slapos.cookbook module = pulse2 +[mmc_core] +recipe = hexagonit.recipe.cmmi +url = +#md5sum = 832f96a6ec4b8fc7cf49b9efd4e89060 +#configure-options = +environment = + PATH=${pkgconfig:location}/bin:%(PATH)s + PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig + CPPFLAGS =-I${libuuid:location}/include + LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib + +[pulse2] +recipe = hexagonit.recipe.cmmi +url = +#md5sum = 832f96a6ec4b8fc7cf49b9efd4e89060 +#configure-options = +environment = + PATH=${pkgconfig:location}/bin:%(PATH)s + PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig + CPPFLAGS =-I${libuuid:location}/include + LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib + + + + [slaposcookbook] recipe = plone.recipe.command git_param =--quiet -b pulse @@ -80,24 +100,6 @@ stop-on-error = true command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1; update-command = cd ${:location} && ${git:location}/bin/git pull --quiet -[pulse2] -recipe = plone.recipe.command -svn_param =--quiet -svn = ${svn:location}/bin/svn -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -command = ${:svn} checkout ${:svn_param} http://mds.mandriva.org/svn/mmc-projects/pulse2/server/trunk/ ${:location} || exit 1; -update-command = cd ${:location} && ${svn:location}/bin/svn up --quiet - -[mmc] -recipe = plone.recipe.command -svn_param =--quiet -svn = ${svn:location}/bin/svn -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -command = ${:svn} checkout ${:svn_param} http://mds.mandriva.org/svn/mmc-projects/mmc-core/trunk/ ${:location} || exit 1; -update-command = cd ${:location} && ${svn:location}/bin/svn up --quiet - [instance-recipe-egg] recipe = zc.recipe.egg python = python2.7 @@ -110,18 +112,21 @@ eggs = ${lxml-python:egg} Twisted SQLAlchemy + MySQL-python + pyOpenSSL + python-ldap [template] # Default template for the instance. recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = 837caf9897332a5f70c72438f1dc5bae +#md5sum = 837caf9897332a5f70c72438f1dc5bae output = ${buildout:directory}/template.cfg mode = 0644 [versions] # Required by Pulse2 -SQLAlchemy = 0. +SQLAlchemy = 0.6.0 #slapos.cookbook = 0.4 # Required by slapos.cookbook==0.4