Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos
Commits
c9ce69f6
Commit
c9ce69f6
authored
Jun 12, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/erp5-component' into erp5
parents
c22ca954
263ebb0d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
12 deletions
+13
-12
component/imagemagick/buildout.cfg
component/imagemagick/buildout.cfg
+2
-2
software/erp5/instance-tidstorage.cfg.in
software/erp5/instance-tidstorage.cfg.in
+6
-4
software/erp5/software.cfg
software/erp5/software.cfg
+2
-2
software/erp5/zope.conf.in
software/erp5/zope.conf.in
+2
-4
stack/erp5.cfg
stack/erp5.cfg
+1
-0
No files found.
component/imagemagick/buildout.cfg
View file @
c9ce69f6
...
...
@@ -28,8 +28,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
[imagemagick]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.7-
2
.tar.bz2
md5sum =
3c6e85d25f3b4f811213a1ec618db2a0
url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.7-
7
.tar.bz2
md5sum =
5cc2d3cce6309840f8238482b82d6785
depends =
${libtiff:version}
${librsvg:version}
...
...
software/erp5/instance-tidstorage.cfg.in
View file @
c9ce69f6
...
...
@@ -34,7 +34,7 @@ backward compatibility with existing automatically setup CAs.
{% macro zope(
name,
thread_amount=1,
time
server=False
,
time
rserver_interval=0
,
longrequest_logger_file='',
longrequest_logger_timeout='',
longrequest_logger_interval=''
...
...
@@ -49,7 +49,9 @@ lock-file = ${directory:run}/{{ name }}.lock
{% set offset = zope_dummy_list | length -%}
port = {{ zope_port_base + offset }}
thread-amount = {{ thread_amount }}
timeserver = {{ timeserver }}
{% if timerserver_interval -%}
timerserver-interval = {{ timerserver_interval }}
{% endif -%}
event-log = ${directory:log}/{{ name }}-event.log
z2-log = ${directory:log}/{{ name }}-Z2.log
...
...
@@ -354,12 +356,12 @@ context =
${:extra-context}
# Distribution node
{{ zope('zope-distribution', time
server=True
) }}
{{ zope('zope-distribution', time
rserver_interval=1
) }}
# Admin node
{{ zope('zope-admin') }}
# Activity nodes
{% for q in range(1, json['activity']['zopecount'] + 1) -%}
{{ zope('zope-activity-%s' % q, time
server=True
) }}
{{ zope('zope-activity-%s' % q, time
rserver_interval=1
) }}
{%- endfor %}
# Other zopes, apaches and haproxies
{% set publish_url_list = [] -%}
...
...
software/erp5/software.cfg
View file @
c9ce69f6
...
...
@@ -132,7 +132,7 @@ extra-context =
[template-tidstorage]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum =
4e99979af04da930842d4ebd0d114a29
md5sum =
c1f6873f758af9ee5661be986eeaf9eb
mode = 640
[template-cloudooo]
...
...
@@ -147,7 +147,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
[template-zope-conf]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/zope.conf.in
md5sum =
98852d8e717941a4c994d36d2c8961d0
md5sum =
0f223ba99a513b197f7cf8acf8c347cf
mode = 640
[template]
...
...
software/erp5/zope.conf.in
View file @
c9ce69f6
...
...
@@ -48,12 +48,10 @@ products {{ product }}
</product-config>
{% endif -%}
{# BBB: should not have to compare those values to begin with: just take a
parameter with timerserver interval, empty string meaning disabled -#}
{% if parameter_dict['timeserver'] in ('y', 'yes', '1', 'true') -%}
{% if 'timerserver-interval' in parameter_dict -%}
%import timerserver
<timer-server>
interval
1
interval
{{ parameter_dict['timerserver-interval'] }}
</timer-server>
{% endif -%}
...
...
stack/erp5.cfg
View file @
c9ce69f6
...
...
@@ -344,6 +344,7 @@ eggs =
python-magic
python-memcached
pytz
requests
threadframe
timerserver
urlnorm
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment