Skip to content
Snippets Groups Projects
Commit 7656f02fe997 authored by Balasankar "Balu" C's avatar Balasankar "Balu" C
Browse files

Add plugin directory setting to Mattermost exception

parent 0806a3e2f0c1
No related merge requests found
......@@ -1200,6 +1200,8 @@
# mattermost['gitlab_token_endpoint'] = "http://gitlab.example.com/oauth/token"
# mattermost['gitlab_user_api_endpoint'] = "http://gitlab.example.com/api/v4/user"
# mattermost['file_directory'] = "/var/opt/gitlab/mattermost/data"
# mattermost['plugin_directory'] = "/var/opt/gitlab/mattermost/plugins"
# mattermost['plugin_client_directory'] = "/var/opt/gitlab/mattermost/client-plugins"
################################################################################
## Mattermost NGINX
......
......@@ -42,3 +42,5 @@
default['mattermost']['gitlab_auth_endpoint'] = nil
default['mattermost']['gitlab_token_endpoint'] = nil
default['mattermost']['gitlab_user_api_endpoint'] = nil
default['mattermost']['plugin_directory'] = "/var/opt/gitlab/mattermost/plugins"
default['mattermost']['plugin_client_directory'] = "/var/opt/gitlab/mattermost/client-plugins"
......@@ -26,7 +26,7 @@
end
end
def self.get_env_variables(node)
def self.get_env_variables(node) # rubocop:disable Metrics/AbcSize (disabled because it is false positive)
{
'MM_SERVICESETTINGS_SITEURL' => node['mattermost']['service_site_url'].to_s,
'MM_SERVICESETTINGS_LISTENADDRESS' => "#{node['mattermost']['service_address']}:#{node['mattermost']['service_port']}",
......@@ -45,6 +45,8 @@
'MM_GITLABSETTINGS_AUTHENDPOINT' => node['mattermost']['gitlab_auth_endpoint'].to_s,
'MM_GITLABSETTINGS_TOKENENDPOINT' => node['mattermost']['gitlab_token_endpoint'].to_s,
'MM_GITLABSETTINGS_USERAPIENDPOINT' => node['mattermost']['gitlab_user_api_endpoint'].to_s,
'MM_PLUGINSETTINGS_DIRECTORY' => node['mattermost']['plugin_directory'].to_s,
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => node['mattermost']['plugin_client_directory'].to_s
}
end
end unless defined?(MattermostHelper) # Prevent reloading in chefspec: https://github.com/sethvargo/chefspec/issues/562#issuecomment-74120922
......@@ -104,7 +104,9 @@
gitlab_token_endpoint
gitlab_user_api_endpoint
email_invite_salt
file_public_link_salt)
file_public_link_salt
plugin_directory
plugin_client_directory)
end
def next_major_version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment