Commit 4346b389 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fixup! stack/erp5: add sql-read-committed-connection.

parent 7df3a5c6
...@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3 ...@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = 22d47c78a364e32ebe5fa93fa18caf6d md5sum = 26b323080f2d53a302e178349268e112
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880 ...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = e1d22118dfcc8d5e929ffa647e0f7256 md5sum = 9e6440425167a506bd473a3697eaa9e6
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -264,8 +264,6 @@ inituser = {{ slapparameter_dict['inituser-login'] }} ...@@ -264,8 +264,6 @@ inituser = {{ slapparameter_dict['inituser-login'] }}
{% set mysql_db = mysql.path.split('/')[1] -%} {% set mysql_db = mysql.path.split('/')[1] -%}
sql-connection-string = {{ '%s@erp5-catalog-0:%s %s %s' % ( sql-connection-string = {{ '%s@erp5-catalog-0:%s %s %s' % (
mysql_db, mysql.port, mysql.username, mysql.password) }} mysql_db, mysql.port, mysql.username, mysql.password) }}
sql-read-committed-connection-string = {{ '!READ-COMMITTED %s@erp5-catalog-0:%s %s %s' % (
mysql_db, mysql.port, mysql.username, mysql.password) }}
bt5 = {{ slapparameter_dict['bt5'] }} bt5 = {{ slapparameter_dict['bt5'] }}
bt5-repository-url = {{ slapparameter_dict['bt5-repository-url'] }} bt5-repository-url = {{ slapparameter_dict['bt5-repository-url'] }}
id-store-interval = {{ dumps(slapparameter_dict['id-store-interval']) }} id-store-interval = {{ dumps(slapparameter_dict['id-store-interval']) }}
......
...@@ -58,7 +58,6 @@ trusted-proxy 0.0.0.0 ...@@ -58,7 +58,6 @@ trusted-proxy 0.0.0.0
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%} {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
{% set sql_read_committed_connection_string = parameter_dict.get('sql-read-committed-connection-string') -%}
{% if sql_connection_string -%} {% if sql_connection_string -%}
{% set bt5_repository_url = [] -%} {% set bt5_repository_url = [] -%}
{% set sr_path = os.path.realpath(parameter_dict['home'] + '/software_release') + '/' -%} {% set sr_path = os.path.realpath(parameter_dict['home'] + '/software_release') + '/' -%}
...@@ -72,8 +71,7 @@ trusted-proxy 0.0.0.0 ...@@ -72,8 +71,7 @@ trusted-proxy 0.0.0.0
id {{ parameter_dict['site-id'] }} id {{ parameter_dict['site-id'] }}
owner {{ parameter_dict['inituser'] }} owner {{ parameter_dict['inituser'] }}
erp5_sql_connection_string {{ sql_connection_string }} erp5_sql_connection_string {{ sql_connection_string }}
erp5_sql_read_committed_connection_string {{ sql_read_committed_connection_string }} cmf_activity_sql_connection_string !READ-COMMITTED {{ sql_connection_string }}
cmf_activity_sql_connection_string {{ sql_read_committed_connection_string }}
bt5_repository_url {{ ' '.join(bt5_repository_url) }} bt5_repository_url {{ ' '.join(bt5_repository_url) }}
bt5 {{ parameter_dict['bt5'] }} bt5 {{ parameter_dict['bt5'] }}
{%- if parameter_dict['id-store-interval'] != None %} {%- if parameter_dict['id-store-interval'] != None %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment