Merge branch 'mattermost_db_driver_config' into 'master'

Add option to configure db driver for mattermost.

Fixes #739

See merge request !460

files/gitlab-config-template/gitlab.rb.template

@@ -661,8 +661,9 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['service_allowed_login_attempts'] = 10
 # mattermost['service_allow_email_sign_up'] = false
 
-# mattermost['sql_data_source'] = nil
-# mattermost['sql_data_source_replicas'] = []
+# mattermost['sql_driver_name'] = 'mysql'
+# mattermost['sql_data_source'] = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"
+# mattermost['sql_data_source_replicas'] = ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"]
 # mattermost['sql_max_idle_conns'] = 10
 # mattermost['sql_max_open_conns'] = 10
 # mattermost['sql_trace'] = false

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -563,6 +563,7 @@ default['gitlab']['mattermost']['service_storage_directory'] = "/var/opt/gitlab/
 default['gitlab']['mattermost']['service_allowed_login_attempts'] = 10
 default['gitlab']['mattermost']['service_allow_email_sign_up'] = true
 
+default['gitlab']['mattermost']['sql_driver_name'] = 'postgres'
 default['gitlab']['mattermost']['sql_data_source'] = nil
 default['gitlab']['mattermost']['sql_data_source_replicas'] = []
 default['gitlab']['mattermost']['sql_max_idle_conns'] = 10

files/gitlab-cookbooks/gitlab/templates/default/config.json.erb

@@ -25,7 +25,7 @@
     },
     "SSOSettings": <%= @oauth.to_json %>,
     "SqlSettings": {
-        "DriverName": "postgres",
+        "DriverName": "<%= @sql_driver_name %>",
         "DataSource": "<%= @sql_data_source %>",
         "DataSourceReplicas": [<%= @sql_data_source_replicas.map{ |dsr| "\"#{dsr}\"" }.join(',') %>],
         "MaxIdleConns": <%= @sql_max_idle_conns %>,