Download as
Browse Code »

Commit d5c736f2d27e4e1341f1054e3063725577071e10

Authored by Antonio Terceiro
1 parent 7ac21657
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Set Django's DEFAULT_FROM_EMAIL 

This fixes password reset emails
Showing 1 changed file with 4 additions and 0 deletions   Show diff stats
cookbooks/colab/templates/settings.yaml.erb
  Diff comments   View file @d5c736f
@@ -14,6 +14,10 @@ ADMINS: &admin @@ -14,6 +14,10 @@ ADMINS: &admin
14 14
15 MANAGERS: *admin 15 MANAGERS: *admin
16 16
  17 +# general Django settings
  18 +DEFAULT_FROM_EMAIL: '<%= node['config']['colab_from_address'] %>'
  19 +
  20 +# colab-specific
17 COLAB_FROM_ADDRESS: '<%= node['config']['colab_from_address'] %>' 21 COLAB_FROM_ADDRESS: '<%= node['config']['colab_from_address'] %>'
18 SERVER_EMAIL: '<%= node['config']['server_email'] %>' 22 SERVER_EMAIL: '<%= node['config']['server_email'] %>'
19 23