Download as
Browse Code »

Commit 2923fd3cc077cadbdce59a6cafaff3a5939fd2b8

Authored by Sergio Oliveira
Committed by Athos
1 parent 16a49e0f
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Settings gitlab host and email_from using our yaml

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
config/development/config.yaml
  Diff comments   View file @2923fd3
@@ -10,4 +10,4 @@ email_subject_prefix: '[spb|dev]' @@ -10,4 +10,4 @@ email_subject_prefix: '[spb|dev]'
10 lists_hostname: listas.dev.softwarepublico.gov.br 10 lists_hostname: listas.dev.softwarepublico.gov.br
11 lists_admin: paulo@softwarelivre.org 11 lists_admin: paulo@softwarelivre.org
12 relay_hostname: relay.dev.softwarepublico.gov.br 12 relay_hostname: relay.dev.softwarepublico.gov.br
13 - 13 +from_address: noreply@dev.softwarepublico.gov.br
config/local/config.yaml
  Diff comments   View file @2923fd3
@@ -11,3 +11,4 @@ lists_hostname: listas.softwarepublico.dev @@ -11,3 +11,4 @@ lists_hostname: listas.softwarepublico.dev
11 lists_admin: paulo@softwarelivre.org 11 lists_admin: paulo@softwarelivre.org
12 relay_hostname: relay.softwarepublico.dev 12 relay_hostname: relay.softwarepublico.dev
13 alt_ssh_port: 5555 13 alt_ssh_port: 5555
  14 +from_address: noreply@softwarepublico.dev
cookbooks/gitlab/templates/gitlab.yml.erb
  Diff comments   View file @2923fd3
1 production: &base 1 production: &base
2 gitlab: 2 gitlab:
3 - host: softwarepublico.dev 3 + host: <%= node['config']['external_hostname'] %>
4 relative_url_root: /gitlab 4 relative_url_root: /gitlab
5 port: 80 # Set to 443 if using HTTPS 5 port: 80 # Set to 443 if using HTTPS
6 https: false # Set to true if using HTTPS 6 https: false # Set to true if using HTTPS
7 - email_from: example@example.com 7 + email_from: <%= node['config']['from_address'] %>
8 default_projects_limit: 10 8 default_projects_limit: 10
9 default_projects_features: 9 default_projects_features:
10 issues: true 10 issues: true