From 2923fd3cc077cadbdce59a6cafaff3a5939fd2b8 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Thu, 23 Apr 2015 19:31:08 -0300 Subject: [PATCH] Settings gitlab host and email_from using our yaml --- config/development/config.yaml | 2 +- config/local/config.yaml | 1 + cookbooks/gitlab/templates/gitlab.yml.erb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/development/config.yaml b/config/development/config.yaml index 2a303d8..d912a54 100644 --- a/config/development/config.yaml +++ b/config/development/config.yaml @@ -10,4 +10,4 @@ email_subject_prefix: '[spb|dev]' lists_hostname: listas.dev.softwarepublico.gov.br lists_admin: paulo@softwarelivre.org relay_hostname: relay.dev.softwarepublico.gov.br - +from_address: noreply@dev.softwarepublico.gov.br diff --git a/config/local/config.yaml b/config/local/config.yaml index 1e2f02e..86d74f1 100644 --- a/config/local/config.yaml +++ b/config/local/config.yaml @@ -11,3 +11,4 @@ lists_hostname: listas.softwarepublico.dev lists_admin: paulo@softwarelivre.org relay_hostname: relay.softwarepublico.dev alt_ssh_port: 5555 +from_address: noreply@softwarepublico.dev diff --git a/cookbooks/gitlab/templates/gitlab.yml.erb b/cookbooks/gitlab/templates/gitlab.yml.erb index 44a5d6d..7ea79e9 100644 --- a/cookbooks/gitlab/templates/gitlab.yml.erb +++ b/cookbooks/gitlab/templates/gitlab.yml.erb @@ -1,10 +1,10 @@ production: &base gitlab: - host: softwarepublico.dev + host: <%= node['config']['external_hostname'] %> relative_url_root: /gitlab port: 80 # Set to 443 if using HTTPS https: false # Set to true if using HTTPS - email_from: example@example.com + email_from: <%= node['config']['from_address'] %> default_projects_limit: 10 default_projects_features: issues: true -- libgit2 0.21.2