Download as
Browse Code »

Commit ff64e64814d45ab2c99e9b8cfba3f5f128f4182e

Authored by David Silva
1 parent 71dc7fd7
Exists in master and in 27 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_list_style_on_folder_elements, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, lxc_settings, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_sisp_buttons, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories

Uses postconf to configure main.cf 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Lucas Severo <lucassalves65@gmail.com>
Signed-off-by: Alessando Caetano <alessandro.caetanob@gmail.com>
Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
cookbooks/mailman/files/centos/master.cf
  Diff comments   View file @ff64e64
@@ -122,7 +122,7 @@ scache unix - - n - 1 scache @@ -122,7 +122,7 @@ scache unix - - n - 1 scache
122 #scalemail-backend unix - n n - 2 pipe 122 #scalemail-backend unix - n n - 2 pipe
123 # flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store 123 # flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store
124 # ${nexthop} ${user} ${extension} 124 # ${nexthop} ${user} ${extension}
125 -# 125 +
126 mailman unix - n n - - pipe 126 mailman unix - n n - - pipe
127 flags=FR user=mailman:mailman argv=/usr/lib/mailman/bin/postfix-to-mailman.py 127 flags=FR user=mailman:mailman argv=/usr/lib/mailman/bin/postfix-to-mailman.py
128 ${nexthop} ${user} 128 ${nexthop} ${user}
cookbooks/mailman/recipes/default.rb
  Diff comments   View file @ff64e64
@@ -83,11 +83,18 @@ cookbook_file &#39;/etc/cron.d/mailman-spb&#39; do @@ -83,11 +83,18 @@ cookbook_file &#39;/etc/cron.d/mailman-spb&#39; do
83 mode 0644 83 mode 0644
84 end 84 end
85 85
  86 +execute 'postfix:disable-email-prod' do
  87 + command "postconf 'default_transport = fs_mail'"
  88 + not_if "cat /etc/postfix/main.cf | grep 'default_transport = fs_mail'"
  89 + action :nothing
  90 +end
  91 +
86 cookbook_file '/etc/postfix/master.cf' do 92 cookbook_file '/etc/postfix/master.cf' do
87 unless node['environment'] == "prod" 93 unless node['environment'] == "prod"
88 source 'master.cf.development' 94 source 'master.cf.development'
  95 + notifies :run, 'execute[postfix:disable-email-prod]'
89 end 96 end
90 - notifies :reload, 'service[postfix]' 97 + notifies :restart, 'service[postfix]'
91 end 98 end
92 99
93 execute 'set-mailman-default-list' do 100 execute 'set-mailman-default-list' do