[Erp5-report] r32615 luke - in /erp5/trunk/buildout: ./ instance-profiles/ profiles/ templa...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 16 14:27:55 CET 2010
Author: luke
Date: Tue Feb 16 14:27:55 2010
New Revision: 32615
URL: http://svn.erp5.org?rev=32615&view=rev
Log:
- implement oood instance generation with extending required dependency
Added:
erp5/trunk/buildout/templates/oood-runserw.in (with props)
erp5/trunk/buildout/templates/oood.conf.in
Modified:
erp5/trunk/buildout/instance-profiles/oood.cfg
erp5/trunk/buildout/official.cfg
erp5/trunk/buildout/profiles/mandriva2010.0.cfg
Modified: erp5/trunk/buildout/instance-profiles/oood.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/oood.cfg?rev=32615&r1=32614&r2=32615&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] Tue Feb 16 14:27:55 2010
@@ -1,2 +1,30 @@
-# OpenOffice.org daemon instance buildout
[buildout]
+parts = oood-instance
+
+[configuration]
+oood_conf_file = ${buildout:etc-directory}/oood.conf
+oood_log_file = ${buildout:log-directory}/oood.log
+oood_home = ${oood:location}/oood
+oood_run = ${buildout:var-directory}/oood
+oood_tmp = ${:oood_run}
+oood_host = 127.0.0.1
+oood_port = 8008
+oood_pool_host = localhost
+oood_pool_range_start = 4060
+oood_instance_load_time = 20
+oood_instance_timeout = 360
+oood_virtual_display_id = 99
+
+
+[oood-etc]
+recipe = collective.recipe.template
+input = ${buildout:directory}/templates/oood.conf.in
+output = ${configuration:oood_conf_file}
+
+[oood-instance]
+recipe = collective.recipe.template
+input = ${buildout:directory}/templates/oood-runserw.in
+output = ${buildout:data-bin-directory}/oood-runserw
+
+[requirements]
+binary = Xvfb
Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32615&r1=32614&r2=32615&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Tue Feb 16 14:27:55 2010
@@ -1,5 +1,8 @@
[buildout]
extends =
+ instance-profiles/mysql.cfg
+ instance-profiles/oood.cfg
+ instance-profiles/zope.cfg
profiles/versions.cfg
software-profiles/apache.cfg
software-profiles/erp5.cfg
Modified: erp5/trunk/buildout/profiles/mandriva2010.0.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/mandriva2010.0.cfg?rev=32615&r1=32614&r2=32615&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/mandriva2010.0.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/mandriva2010.0.cfg [utf8] Tue Feb 16 14:27:55 2010
@@ -23,6 +23,7 @@
subversion
subversion-devel
subversion-tools
+ x11-server-xvfb
zlib1-devel
command = echo "${:package_list}" | xargs sudo urpmi --auto
Added: erp5/trunk/buildout/templates/oood-runserw.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/oood-runserw.in?rev=32615&view=auto
==============================================================================
--- erp5/trunk/buildout/templates/oood-runserw.in (added)
+++ erp5/trunk/buildout/templates/oood-runserw.in [utf8] Tue Feb 16 14:27:55 2010
@@ -1,0 +1,2 @@
+#!/bin/sh
+cd ${buildout:etc-directory} && ${configuration:openoffice_python} ${oood:location}/oood/runserw.py $@
Propchange: erp5/trunk/buildout/templates/oood-runserw.in
------------------------------------------------------------------------------
svn:executable = *
Added: erp5/trunk/buildout/templates/oood.conf.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/oood.conf.in?rev=32615&view=auto
==============================================================================
--- erp5/trunk/buildout/templates/oood.conf.in (added)
+++ erp5/trunk/buildout/templates/oood.conf.in [utf8] Tue Feb 16 14:27:55 2010
@@ -1,0 +1,109 @@
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability 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
+# garantees 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 2
+# 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.
+#
+##############################################################################
+
+###################################################################
+# System config
+###################################################################
+
+[System]
+# Folder where all oood core files are installed
+oood_home = ${configuration:oood_home}
+# Folder where pid files, lock files and virtual frame buffer mappings are stored
+run_dir = ${configuration:oood_run}
+tmp_dir = ${configuration:oood_tmp}
+# Folder where OpenOffice Uno interpreter is installed
+uno_path = ${configuration:openoffice_uno}
+# Folder where soffice is installed (default: uno_path)
+prog_dir = ${configuration:openoffice_program}
+# Complete absolute path to the log file
+log_file = ${configuration:oood_log_file}
+# debug_mode tells oood to leave files in tmp directory
+debug_mode = False
+log_level = logging.DEBUG
+
+
+###################################################################
+# Server settings
+###################################################################
+
+[Server]
+server_host = ${configuration:oood_host}
+# Other http-alt ports are 591 and 8080
+server_port = ${configuration:oood_port}
+# name of local printer to print files directly
+printer_name = default_printer
+
+
+###################################################################
+# Pool settings
+###################################################################
+
+[Pool]
+# The pool consist of several OpenOffice.org instances
+pool_host = ${configuration:oood_pool_host}
+# According www.iana.org/assignments/port-numbers , 4060-4088 port range is unassigned
+pool_port_range_start = ${configuration:oood_pool_range_start}
+# time in seconds we have to give one OOo instance to load in restart
+instance_load_time = ${configuration:oood_instance_load_time}
+# seconds to wait before killing and restarting OOo instance
+instance_timeout = ${configuration:oood_instance_timeout}
+# ID of the virtual display where OOo instances are launched
+virtual_display_id = ${configuration:oood_virtual_display_id}
+
+###################################################################
+# Formats
+###################################################################
+# Here you can configure which file formats should be included on the
+# "target format item list" and which should be skipped
+# by either specifying formats to use, or formats to skip
+# default is using all formats defined in mimemapper
+# Format list should be given as comma-separated list of extensions
+# (as defined in mimemapper)
+# example:
+# [Text]
+# use_formats = odt, doc, rtf, html-writer, pdf
+# [Spreadsheet]
+# skip_formats = slk, pxl, 3_0.sdc.vor
+# XXX for now, if you use this option, you MUST include ODF format in
+# your "use" list, otherwise oood will return an empty list. This is a
+# bug and will be fixed.
+
+[Text]
+#use_formats = All
+#skip_formats = None
+
+[Spreadsheet]
+#use_formats = All
+#skip_formats = None
+
+[Presentation]
+#use_formats = All
+#skip_formats = None
+
+[Drawing]
+#use_formats = All
+#skip_formats = None
More information about the Erp5-report
mailing list