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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
6f32b361
Commit
6f32b361
authored
Jul 19, 2017
by
Hardik Juneja
Committed by
Rafael Monnerat
Jul 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make slapos-master compatible with the recent changes done in erp5 stack through !202
/reviewed-on
nexedi/slapos!203
parent
823ba86d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+1
-1
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+4
-1
No files found.
software/slapos-master/buildout.hash.cfg
View file @
6f32b361
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# not need these here).
# not need these here).
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
50834c59ded302034cafcce7315a55c
3
md5sum =
649137323f971026a6c62e357ce3f51
3
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
6f32b361
...
@@ -36,6 +36,7 @@ config-{{ k }} = {{ dumps(v) }}
...
@@ -36,6 +36,7 @@ config-{{ k }} = {{ dumps(v) }}
{% for k, v in key_config.iteritems() -%}
{% for k, v in key_config.iteritems() -%}
config-{{ k }} = {{ '${' ~ v ~ '}' }}
config-{{ k }} = {{ '${' ~ v ~ '}' }}
{% endfor -%}
{% endfor -%}
config-name = {{ name }}
{% endmacro -%}
{% endmacro -%}
{{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
{{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
...
@@ -199,6 +200,7 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
...
@@ -199,6 +200,7 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
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-name = {{ partition_name }}
{% endfor -%}
{% endfor -%}
{# if not explicitly configured, connect jupyter to first zope family, which -#}
{# if not explicitly configured, connect jupyter to first zope family, which -#}
...
@@ -310,6 +312,7 @@ config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
...
@@ -310,6 +312,7 @@ config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
config-shared-certificate-authority-path = ${directory:ca-dir}
config-shared-certificate-authority-path = ${directory:ca-dir}
config-monitor-passwd = ${monitor-htpasswd:passwd}
config-monitor-passwd = ${monitor-htpasswd:passwd}
config-name = ${:name}
[request-frontend-base]
[request-frontend-base]
...
@@ -366,7 +369,7 @@ parts +=
...
@@ -366,7 +369,7 @@ parts +=
monitor-base
monitor-base
[monitor-conf-parameters]
[monitor-conf-parameters]
monitor-title = ERP5
monitor
monitor-title = ERP5
password = ${monitor-htpasswd:passwd}
password = ${monitor-htpasswd:passwd}
[monitor-base-url-dict]
[monitor-base-url-dict]
...
...
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