From 3ad1032eb5d5f540f33b3a414a5f90c3543824da Mon Sep 17 00:00:00 2001 From: Iwan Clement Date: Sat, 18 Apr 2020 09:56:25 +0200 Subject: [PATCH] All good --- gitlab/docker-compose.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index ae3f2ab..d020f09 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -8,18 +8,19 @@ services: environment: GITLAB_OMNIBUS_CONFIG: | external_url 'https://gitlab.devops-lyon.eu' - gitlab_rails['gitlab_email_enabled'] true - gitlab_rails['gitlab_email_from'] 'gitlab@mg.devops-lyon.eu' - gitlab_rails['gitlab_email_display_name'] 'Gitlab notification' - gitlab_rails['gitlab_email_reply_to'] 'noreply@mg.devops-lyon.eu - gitlab_rails['smtp_enable'] true - gitlab_rails['smtp_address'] "smtp.mailgun.org" - gitlab_rails['smtp_port'] 465 - gitlab_rails['smtp_user_name'] "postmaster@mg.devops-lyon.eu" - gitlab_rails['smtp_password'] "2b074061f7fcc2562af5e8002a246abf-9a235412-23599447" - gitlab_rails['smtp_domain'] "mg.devops-lyon.eu" - gitlab_rails['smtp_enable_starttls_auto'] true - # gitlab_rails['smtp_authentication'] "login"' + gitlab_rails['time_zone'] = 'Europe/Paris' + gitlab_rails['gitlab_email_enabled'] = true + gitlab_rails['gitlab_email_from'] = 'gitlab@mg.devops-lyon.eu' + gitlab_rails['gitlab_email_display_name'] = 'Gitlab notification' + gitlab_rails['gitlab_email_reply_to'] = 'noreply@mg.devops-lyon.eu' + gitlab_rails['smtp_enable'] = true + gitlab_rails['smtp_address'] = 'smtp.mailgun.org' + gitlab_rails['smtp_port'] = 465 + gitlab_rails['smtp_user_name'] = 'postmaster@mg.devops-lyon.eu' + gitlab_rails['smtp_password'] = '2b074061f7fcc2562af5e8002a246abf-9a235412-23599447' + gitlab_rails['smtp_domain'] = 'mg.devops-lyon.eu' + gitlab_rails['smtp_enable_starttls_auto'] = true + # gitlab_rails['smtp_authentication'] 'login' # Add any other gitlab.rb configuration here, each on its own line ports: - '4380:80'