Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ayush Tiwari
slapos
Commits
323a96af
Commit
323a96af
authored
Jul 15, 2014
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: fix http-monitor connection parameter url not found
parent
48b3707b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-1
stack/erp5/instance-http-monitor.cfg.in
stack/erp5/instance-http-monitor.cfg.in
+5
-0
No files found.
stack/erp5/buildout.cfg
View file @
323a96af
...
...
@@ -180,7 +180,7 @@ context =
recipe = slapos.recipe.template
filename = instance-http-monitor.cfg.in
url = ${:_profile_base_location_}/${:filename}
md5sum =
d2ddadaa0459319745b78dc70420075
5
md5sum =
7fb20468f1825a82951a222df9c8b04
5
output = ${buildout:directory}/template-http-monitor.cfg.in
##################e
...
...
@@ -318,7 +318,7 @@ extra-context =
[template-erp5]
< = download-base
filename = instance-erp5.cfg.in
md5sum =
4afd0d660c67714d01c3c519c549eed0
md5sum =
69bb1bdfde41489c16ed5fef7484d672
[template-neo]
< = download-base
...
...
stack/erp5/instance-erp5.cfg.in
View file @
323a96af
...
...
@@ -46,7 +46,7 @@ config-{{ option }} = {{ dumps(value) }}
{# Fail early if an unexpected value is provided -#}
{% set possible_software_type_dict = {'zeo': 'zeo', 'neo': 'neo'} -%}
{{ request('zodb', 'zodb-' ~ possible_software_type_dict[slapparameter_dict.get('zodb-software-type', 'zeo')], 'zodb', {'tcpv4-port': 2100, 'zodb-dict': {'root': {}}}, {'zodb-storage-type': False, 'zodb-dict': False, 'tidstorage-ip': False, 'tidstorage-port': False}) }}
{{ request('http-monitor', 'http-monitor', 'http-monitor', {}) }}
{{ request('http-monitor', 'http-monitor', 'http-monitor', {}
, {'monitor-url': True}
) }}
[inituser-password]
{% set inituser_password = slapparameter_dict.get('inituser-password') -%}
...
...
stack/erp5/instance-http-monitor.cfg.in
View file @
323a96af
...
...
@@ -18,6 +18,7 @@ parts =
monitor-promise
monitor-instance-log-access
monitor-check-cache-hit
publish-http-monitor
extends = ${monitor-template:output}
...
...
@@ -43,4 +44,8 @@ json_resolve_list = ["www.erp5.com:80:5.135.149.226"]
recipe = slapos.cookbook:zero-knowledge.read
filename = $${public:filename}
[publish-http-monitor]
recipe = slapos.cookbook:publish.serialised
monitor-url = $${monitor-parameters:url}
{% endif %}
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