software/erp5, stack/erp5: Add ODBC for MariaDB CONNECT engine.

software/erp5/instance-mariadb-schema.json

@@ -122,6 +122,12 @@
         }
       },
       "type": "object"
-    }
+    },
+    "odbc-ini": {
+      "description": "Contents of odbc.ini file, see unixodbc document",
+      "default": "",
+      "type": "string"
+    },
+
   }
 }

stack/erp5/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = da7c36ecb490b67360d2afda94b41bff
+md5sum = 705f017e19dc2d1048770284d1d6b31f
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in

stack/erp5/instance-mariadb.cfg.in

@@ -128,6 +128,7 @@ port = {{ port }}
 socket = ${directory:run}/mariadb.sock
 data-directory = ${directory:mariadb-data}
 tmp-directory = ${directory:tmp}
+etc-directory = ${directory:etc}
 pid-file = ${directory:run}/mariadb.pid
 error-log = ${directory:log}/mariadb_error.log
 slow-query-log = ${directory:log}/mariadb_slowquery.log
@@ -185,11 +186,22 @@ template = inline:#!{{ dash }}
     --skip-name-resolve \
     --datadir='${my-cnf-parameters:data-directory}' \
     --basedir='{{ parameter_dict['mariadb-location'] }}' \
-  && exec '{{ parameter_dict['mariadb-location'] }}/bin/mysqld' \
+  && ODBCSYSINI='${my-cnf-parameters:etc-directory}' exec '{{ parameter_dict['mariadb-location'] }}/bin/mysqld' \
     --defaults-file='${my-cnf:rendered}' \
     "$@"
 rendered = ${directory:services}/mariadb
 
+[odbc-ini-text]
+text = {{ dumps(slapparameter_dict.get('odbc-ini', '').encode('base64')) }}
+
+[{{ section('odbc-ini') }}]
+< = jinja2-template-base
+rendered = ${directory:etc}/odbc.ini
+template = inline:{% raw -%}
+  {{ parameter_dict['text'].decode('base64') }}
+  {%- endraw %}
+context = section parameter_dict odbc-ini-text
+
 [{{ section('logrotate-entry-mariadb') }}]
 < = logrotate-entry-base
 name = mariadb