Allow to specify mariadb port

software/slapos-master/instance-erp5.cfg.in

 {% if slap_software_type == software_type -%}
 {% set frontend_dict = slapparameter_dict.get('frontend', {}) %}
+{% set mariadb_dict = slapparameter_dict.get('mariadb', {}) %}
 {% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
 {% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
 {% set inituser_login = slapparameter_dict.get('inituser-login', 'zope') -%}
@@ -42,7 +43,7 @@ config-{{ option }} = {{ dumps(value) }}
 {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}) }}
 {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}) }}
 {{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}) }}
-{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True}) }}
+{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': dumps(mariadb_dict.get('tcpv4-port', 2099))}, {'database-list': True, 'test-database-list': True}) }}
 {# 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}) }}
@@ -257,7 +258,6 @@ company = {{ dumps(slapparameter_dict.get('company', 'Compagny')) }}
 recipe = plone.recipe.command
 stop-on-error = true
 command =
-  chmod -R 770 ${apache-certificate-authority:ca-dir} && \
   chmod 644 ${apache-certificate-authority:ca-dir}/openssl.cnf
 update-command = ${:command}
 

software/slapos-master/software.cfg

@@ -70,7 +70,7 @@ mode = 644
 [template-erp5]
 < = download-base-part
 filename = instance-erp5.cfg.in
-md5sum = 371157b65c48a9695b256dc335a908e7
+md5sum = 7a0415001f160129cbc143d102888341
 
 [template-balancer]
 < = download-base-part