From 01ca2af9aa79e3ffba1c50ffb9036d1e86fd8698 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Sun, 15 Oct 2017 02:22:34 +0200
Subject: [PATCH] mattermost disabled

---
 webserver/docker_gitlab/templates/gitlab.rb | 62 ++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/webserver/docker_gitlab/templates/gitlab.rb b/webserver/docker_gitlab/templates/gitlab.rb
index 2cb8d83c..1131f327 100644
--- a/webserver/docker_gitlab/templates/gitlab.rb
+++ b/webserver/docker_gitlab/templates/gitlab.rb
@@ -586,28 +586,28 @@ nginx['proxy_set_headers'] = {
 # GitLab Mattermost #
 #####################
 
-mattermost_external_url 'https://mattermost.warpzone.ms/'
+#mattermost_external_url 'https://mattermost.warpzone.ms/'
 
-mattermost['enable'] = true
+mattermost['enable'] = false
 # mattermost['username'] = 'mattermost'
 # mattermost['group'] = 'mattermost'
 # mattermost['home'] = '/var/opt/gitlab/mattermost'
 # mattermost['database_name'] = 'mattermost_production'
 
-mattermost['service_use_ssl'] = true
-mattermost['service_address'] = "0.0.0.0"
-mattermost['service_port'] = "8065"
+#mattermost['service_use_ssl'] = true
+#mattermost['service_address'] = "0.0.0.0"
+#mattermost['service_port'] = "8065"
 
 # mattermost['service_maximum_login_attempts'] = 10
 # mattermost['service_segment_developer_key'] = nil
 # mattermost['service_google_developer_key'] = nil
-mattermost['service_enable_incoming_webhooks'] = true
-mattermost['service_enable_post_username_override'] = true
-mattermost['service_enable_post_icon_override'] = true
+#mattermost['service_enable_incoming_webhooks'] = true
+#mattermost['service_enable_post_username_override'] = true
+#mattermost['service_enable_post_icon_override'] = true
 # mattermost['service_enable_testing'] = false
 # mattermost['service_enable_security_fix_alert'] = true
 # mattermost['service_enable_insecure_outgoing_connections'] = false
-mattermost['service_enable_outgoing_webhooks'] = true
+#mattermost['service_enable_outgoing_webhooks'] = true
 # mattermost['service_enable_commands'] = false
 # mattermost['service_enable_only_admin_integrations'] = true
 # mattermost['service_enable_oauth_service_provider'] = false
@@ -617,9 +617,9 @@ mattermost['service_enable_outgoing_webhooks'] = true
 # mattermost['service_session_length_sso_in_days'] = 30
 # mattermost['service_session_cache_in_minutes'] = 10
 
-mattermost['team_site_name'] = "Warpzone Mattermost"
+#mattermost['team_site_name'] = "Warpzone Mattermost"
 # mattermost['team_max_users_per_team'] = 150
-mattermost['team_enable_team_creation'] = false
+#mattermost['team_enable_team_creation'] = false
 # mattermost['team_enable_user_creation'] = true
 # mattermost['team_allow_public_link'] = true
 # mattermost['team_allow_valet_default'] = false
@@ -642,30 +642,30 @@ mattermost['team_enable_team_creation'] = false
 # mattermost['log_file_level'] = 'INFO'
 # mattermost['log_file_format'] = nil
 
-mattermost['gitlab_enable'] = true
-mattermost['gitlab_secret'] = "{{ mattermost_api_secret }}"
-mattermost['gitlab_id'] = "{{ mattermost_api_id }}"
-mattermost['gitlab_scope'] = ""
-mattermost['gitlab_auth_endpoint'] = "https://gitlab.warpzone.ms/oauth/authorize"
-mattermost['gitlab_token_endpoint'] = "https://gitlab.warpzone.ms/oauth/token"
-mattermost['gitlab_user_api_endpoint'] = "https://gitlab.warpzone.ms/api/v3/user"
+#mattermost['gitlab_enable'] = true
+#mattermost['gitlab_secret'] = "{{ mattermost_api_secret }}"
+#mattermost['gitlab_id'] = "{{ mattermost_api_id }}"
+#mattermost['gitlab_scope'] = ""
+#mattermost['gitlab_auth_endpoint'] = "https://gitlab.warpzone.ms/oauth/authorize"
+#mattermost['gitlab_token_endpoint'] = "https://gitlab.warpzone.ms/oauth/token"
+#mattermost['gitlab_user_api_endpoint'] = "https://gitlab.warpzone.ms/api/v3/user"
 
 # mattermost['aws'] = {'S3AccessKeyId' => '123', 'S3SecretAccessKey' => '123', 'S3Bucket' => 'aa', 'S3Region' => 'bb'}
 
-mattermost['email_enable_sign_up_with_email'] = false
-mattermost['email_enable_sign_in_with_email'] = false
+#mattermost['email_enable_sign_up_with_email'] = false
+#mattermost['email_enable_sign_in_with_email'] = false
 # mattermost['email_enable_sign_in_with_username'] = false
-mattermost['email_send_email_notifications'] = true
+#mattermost['email_send_email_notifications'] = true
 # mattermost['email_require_email_verification'] = false
-mattermost['email_smtp_username'] = "noreply@warpzone.ms"
-mattermost['email_smtp_password'] = "{{ noreply_email_pass }}"
-mattermost['email_smtp_server'] = "mail.warpzone.ms"
-mattermost['email_smtp_port'] = 25
-mattermost['email_connection_security'] = "STARTTLS"
-mattermost['email_feedback_name'] = "Warpzone Mattermost"
-mattermost['email_feedback_email'] = "noreply@warpzone.ms"
-mattermost['email_send_push_notifications'] = true
-mattermost['email_push_notification_server'] = "http://push-test.mattermost.com"
+#mattermost['email_smtp_username'] = "noreply@warpzone.ms"
+#mattermost['email_smtp_password'] = "{{ noreply_email_pass }}"
+#mattermost['email_smtp_server'] = "mail.warpzone.ms"
+#mattermost['email_smtp_port'] = 25
+#mattermost['email_connection_security'] = "STARTTLS"
+#mattermost['email_feedback_name'] = "Warpzone Mattermost"
+#mattermost['email_feedback_email'] = "noreply@warpzone.ms"
+#mattermost['email_send_push_notifications'] = true
+#mattermost['email_push_notification_server'] = "http://push-test.mattermost.com"
 
 # mattermost['file_driver_name'] = "local"
 # mattermost['file_directory'] = "/var/opt/gitlab/mattermost/data"
@@ -706,7 +706,7 @@ mattermost['email_push_notification_server'] = "http://push-test.mattermost.com"
 # Mattermost NGINX #
 ####################
 
-mattermost_nginx['enable'] = false
+#mattermost_nginx['enable'] = false
 # mattermost_nginx['client_max_body_size'] = '250m'
 # mattermost_nginx['redirect_http_to_https'] = false
 # mattermost_nginx['redirect_http_to_https_port'] = 80
-- 
GitLab