[Erp5-report] r37874 kazuhiko - in /erp5/trunk/buildout: instance-profiles/ profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Aug 18 10:55:03 2010
New Revision: 37874

URL: http://svn.erp5.org?rev=37874&view=rev
Log:
add sphinx recipes.

Added:
    erp5/trunk/buildout/instance-profiles/sphinx.cfg
Modified:
    erp5/trunk/buildout/profiles/deployment.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/profiles/software-definition.cfg

Added: erp5/trunk/buildout/instance-profiles/sphinx.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/sphinx.cfg?rev=37874&view=auto
==============================================================================
--- erp5/trunk/buildout/instance-profiles/sphinx.cfg (added)
+++ erp5/trunk/buildout/instance-profiles/sphinx.cfg [utf8] Wed Aug 18 10:55:03 2010
@@ -0,0 +1,27 @@
+[buildout]
+parts =
+  sphinx-instance
+
+[configuration]
+sphinx_address = 127.0.0.1
+sphinx_port = 9312
+sphinx_sql_port = 9306
+
+# below are candidates to be removed from global configuration
+sphinx_data_dir = ${buildout:var-directory}/sphinx
+sphinx_log_dir = ${buildout:log-directory}/sphinx
+
+[sphinx-instance]
+depends =
+  ${create-directories:command}
+recipe = erp5.recipe.sphinxserver
+sphinx_software_bin = ${software_definition:sphinx_software}/bin
+sphinx_bin_folder =  ${buildout:data-bin-directory}
+sphinx_data_dir = ${configuration:sphinx_data_dir}
+sphinx_log_dir = ${configuration:sphinx_log_dir}
+sphinx_conf_file = ${buildout:etc-directory}/sphinx.cnf
+
+# template related
+sphinx_address = ${configuration:sphinx_address}
+sphinx_port = ${configuration:sphinx_port}
+sphinx_sql_port = ${configuration:sphinx_sql_port}

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=37874&r1=37873&r2=37874&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Wed Aug 18 10:55:03 2010
@@ -8,6 +8,7 @@ extends =
   ../instance-profiles/memcached.cfg
   ../instance-profiles/mysql-database.cfg
   ../instance-profiles/mysql.cfg
+  ../instance-profiles/sphinx.cfg
   ../instance-profiles/oood.cfg
   ../instance-profiles/supervisor.cfg
   ../instance-profiles/zope.cfg
@@ -21,6 +22,7 @@ extends =
 parts =
   software-links
   mysql-instance
+  sphinx-instance
   oood-instance
   supervisor-instance
   memcached-instance
@@ -32,6 +34,7 @@ versions = versions
 supervisor_programs =
   10 mysql (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]
   20 oood (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}
+  30 sphinx (autorestart=true stopsignal=TERM) ${buildout:data-bin-directory}/searchd [ --nodetach ]
 
 [software-links]
 recipe = plone.recipe.command

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=37874&r1=37873&r2=37874&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Wed Aug 18 10:55:03 2010
@@ -19,6 +19,7 @@ extends =
   ../software-profiles/libtool.cfg
   ../software-profiles/memcached.cfg
   ../software-profiles/mysql-tritonn-5.0.cfg
+  ../software-profiles/sphinx.cfg
   ../software-profiles/ocropus.cfg
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
@@ -45,6 +46,7 @@ parts =
   w3m
   xpdf
   mysql-tritonn-5.0
+  sphinx
   imagemagick
   zope-2.8
   cmf15

Modified: erp5/trunk/buildout/profiles/software-definition.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/software-definition.cfg?rev=37874&r1=37873&r2=37874&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/software-definition.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/software-definition.cfg [utf8] Wed Aug 18 10:55:03 2010
@@ -10,6 +10,7 @@ data-bin-directory = ${:var-directory}/b
 
 [software_definition]
 mysql_software = ${:software_home}/parts/mysql-tritonn-5.0
+sphinx_software = ${:software_home}/parts/sphinx
 oood_software = ${:software_home}/parts/oood
 openoffice_software = ${:software_home}/parts/openoffice-bin
 zope_software = ${:software_home}/parts/zope-2.8