Download as
Browse Code »

Commit e521f6e6b05128bdbcec6b27515135935dfd4c0f

Authored by Athos
1 parent ed3d603e
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

Pass user to not if 

Chef::Provider::Execute does not honor user attribute for not_if.
We need to pass the :user argument to not_if in order to achieve that.
:user argument is not accepted in blocks, so we removed the block and
passed the command as argument to not_if.

See https://tickets.opscode.com/browse/CHEF-438
and
https://github.com/tfheen/chef/commit/5a3733edaefc32ffe0a435ba493d76623038b6ba
for references.

Signed-off-by: Carolina Ramalho <carol15022@hotmail.com>
Showing 1 changed file with 1 additions and 4 deletions   Show diff stats
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @e521f6e
@@ -19,10 +19,7 @@ execute &#39;noosfero:schema&#39; do @@ -19,10 +19,7 @@ execute &#39;noosfero:schema&#39; do
19 command "RAILS_ENV=production bundle exec rake db:schema:load && RAILS_ENV=production NOOSFERO_DOMAIN=#{node['config']['external_hostname']} bundle exec rake db:data:minimal" 19 command "RAILS_ENV=production bundle exec rake db:schema:load && RAILS_ENV=production NOOSFERO_DOMAIN=#{node['config']['external_hostname']} bundle exec rake db:data:minimal"
20 cwd '/usr/lib/noosfero' 20 cwd '/usr/lib/noosfero'
21 user 'noosfero' 21 user 'noosfero'
22 - not_if do  
23 - # if the profiles table already exists, the schema was already loaded  
24 - system("psql -h database -U noosfero --no-align --tuples-only -q -c 'select count(*) from profiles'")  
25 - end 22 + not_if "psql -h database -U noosfero --no-align --tuples-only -q -c 'select count(*) from profiles'", :user => 'noosfero'
26 notifies :restart, 'service[noosfero]' 23 notifies :restart, 'service[noosfero]'
27 end 24 end
28 25