Skip to content
Snippets Groups Projects
Commit c4a6a7aa authored by Harrison Healey's avatar Harrison Healey
Browse files

Set environment variable to let MM identify Omnibus installs

parent ca6952ab
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -46,7 +46,8 @@ class MattermostHelper
'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
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => node['mattermost']['plugin_client_directory'].to_s,
'MM_INSTALL_TYPE' => 'gitlab_omnibus'
}
end
end unless defined?(MattermostHelper) # Prevent reloading in chefspec: https://github.com/sethvargo/chefspec/issues/562#issuecomment-74120922
Loading
Loading
@@ -12,6 +12,7 @@ RSpec.describe 'gitlab::mattermost' do
'MM_GITLABSETTINGS_SECRET' => '',
'MM_GITLABSETTINGS_TOKENENDPOINT' => 'http://gitlab.example.com/oauth/token',
'MM_GITLABSETTINGS_USERAPIENDPOINT' => 'http://gitlab.example.com/api/v4/user',
'MM_INSTALL_TYPE' => 'gitlab_omnibus',
'MM_LOGSETTINGS_FILELOCATION' => '/var/log/gitlab/mattermost',
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => '/var/opt/gitlab/mattermost/client-plugins',
'MM_PLUGINSETTINGS_DIRECTORY' => '/var/opt/gitlab/mattermost/plugins',
Loading
Loading
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