diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index ec72dda29756d1bb7ff8226640bec86ce8ae535a..c6e963c912217a3f51df9c58202a1f2977eac06f 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -181,7 +181,7 @@ context = [template-mariadb] < = download-base filename = instance-mariadb.cfg.in -md5sum = 49530879f8c20c2886b096e40f629b4c +md5sum = 4b8c93c851869cc23f211d87007a3b4d link-binary = ${coreutils:location}/bin/basename ${coreutils:location}/bin/cat diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index 7a6085a38c076da49a0ed40f99d80ab02395e9df..1a24f0e816b991c9134483c454d5b43bdfaa3c02 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -150,16 +150,6 @@ data-directory = ${my-cnf-parameters:data-directory} mysql-install-binary = {{ parameter_dict['mariadb-location'] }}/scripts/mysql_install_db mysql-base-directory = {{ parameter_dict['mariadb-location'] }} -[mariadb-instance] -# Options -user = user -parallel-test-database-amount = {{ dumps(slapparameter_dict.get('test-database-amount', 30)) }} -database = erp5 -test-user = erp5_test -test-database = erp5_test -mysql-test-database-base = testdb -mysql-test-user-base = testuser - [logrotate] recipe = slapos.cookbook:logrotate # Binaries