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
Xiaowu Zhang
slapos
Commits
1b6cecec
Commit
1b6cecec
authored
Jan 14, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
introduce errorlog as rss link to slapos-master sr
parent
515e9daf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
5 deletions
+30
-5
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+3
-3
software/slapos-master/instance-zope.cfg.in
software/slapos-master/instance-zope.cfg.in
+25
-0
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+2
-2
No files found.
software/slapos-master/instance-erp5.cfg.in
View file @
1b6cecec
...
@@ -9,9 +9,9 @@
...
@@ -9,9 +9,9 @@
{% set monitor_port = monitor_dict.get('port-base', 2600) %}
{% set monitor_port = monitor_dict.get('port-base', 2600) %}
{% if mariadb_dict.get('monitor', False) -%}
{% if mariadb_dict.get('monitor', False) -%}
{% do mariadb_request_dict.__setitem__('monitor-port', mariadb_dict.get('monitor-port', monitor_port)) -%}
{% do mariadb_request_dict.__setitem__('monitor-port', mariadb_dict.get('monitor-port', monitor_port)) -%}
{% set monitor_count = 2 -%}
{% set monitor_port_balancer = monitor_port + 1 -%}
{% set monitor_port_balancer = monitor_port + 1 -%}
{% endif -%}
{% endif -%}
{% set port_count = 2 -%}
[request-common]
[request-common]
recipe = slapos.cookbook:request.serialised
recipe = slapos.cookbook:request.serialised
...
@@ -127,10 +127,10 @@ config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
...
@@ -127,10 +127,10 @@ config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-monitor = {{ dumps(zope_parameter_dict.get('monitor', False)) }}
config-monitor = {{ dumps(zope_parameter_dict.get('monitor', False)) }}
{% if zope_parameter_dict.get('monitor', False) -%}
{% if zope_parameter_dict.get('monitor', False) -%}
config-monitor-port = {{ zope_parameter_dict.get('monitor-port', monitor_port +
monitor
_count) }}
config-monitor-port = {{ zope_parameter_dict.get('monitor-port', monitor_port +
port
_count) }}
{% endif -%}
{% endif -%}
sla-computer_guid = {{ dumps(zope_parameter_dict.get('computer-guid', computer_id)) }}
sla-computer_guid = {{ dumps(zope_parameter_dict.get('computer-guid', computer_id)) }}
{% set
monitor_count = monitor
_count + 1 -%}
{% set
port_count = port
_count + 1 -%}
{% endfor -%}
{% endfor -%}
{# We need to concatenate lists that we cannot read as lists, so this gets hairy. -#}
{# We need to concatenate lists that we cannot read as lists, so this gets hairy. -#}
...
...
software/slapos-master/instance-zope.cfg.in
View file @
1b6cecec
...
@@ -100,6 +100,31 @@ source = ${directory:logrotate-backup}
...
@@ -100,6 +100,31 @@ source = ${directory:logrotate-backup}
[monitor-parameters]
[monitor-parameters]
port = {{ slapparameter_dict['monitor-port'] }}
port = {{ slapparameter_dict['monitor-port'] }}
# Enable Log As RSS for all zope event log file
{% do part_list.append('log-as-rss-symlink') %}
[error-log-{{ node_id_base }}]
<= error-log-rss-base
script-name = {{ node_id_base }}_Log_AsRSS
extra-context =
section log_file_list zopelog-{{ node_id_base }}-list
raw item_limit 10
raw hour_interval 1
raw rotate_time 24
raw type zope
[zopelog-{{ node_id_base }}-list]
{% for i in range(slapparameter_dict['instance-count']) -%}
{% set name = 'zope-' ~ i -%}
{{ node_id_base ~ '-' ~ i }} = ${directory:log}/{{ name }}-event.log
{% endfor -%}
[{{ section('cron-entry-' ~ node_id_base ~ '-logAsRss') }}]
<= cron
recipe = slapos.cookbook:cron.d
name = ${error-log-{{ node_id_base }}:script-name}
frequency = 30 * * * *
command = ${error-log-{{ node_id_base }}:rendered}
{% endif -%}
{% endif -%}
[certificate-authority-common]
[certificate-authority-common]
...
...
software/slapos-master/software.cfg
View file @
1b6cecec
...
@@ -72,7 +72,7 @@ mode = 644
...
@@ -72,7 +72,7 @@ mode = 644
[template-erp5]
[template-erp5]
< = download-base-part
< = download-base-part
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
f4fe085a0d1f09718a9456df2af8ff79
md5sum =
cf1fc493af0513e02ab106bc864b5d28
[template-balancer]
[template-balancer]
< = download-base-part
< = download-base-part
...
@@ -82,7 +82,7 @@ md5sum = 95f4f8f4b9cbd438a43678af05b3aaeb
...
@@ -82,7 +82,7 @@ md5sum = 95f4f8f4b9cbd438a43678af05b3aaeb
[template-zope]
[template-zope]
< = download-base-part
< = download-base-part
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
01cc08950b7f4358576dd049290c8cee
md5sum =
78c84c121d9f3c5eaf83c48686a4bcca
[template-apache-conf]
[template-apache-conf]
< = download-base-part
< = download-base-part
...
...
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