Download as
Browse Code »

Commit 53326c17a48864f8250f75101af32ceb1f629bc8

Authored by Antonio Terceiro
1 parent 104103af
Exists in master and in 56 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, 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, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, 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, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

fix my stupidity

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
@@ -16,9 +16,10 @@ iptables_file = "config/#{$SPB_ENV}/iptables-filter-rules" @@ -16,9 +16,10 @@ iptables_file = "config/#{$SPB_ENV}/iptables-filter-rules"
16 ENV['CHAKE_TMPDIR'] = "tmp/chake.#{$SPB_ENV}" 16 ENV['CHAKE_TMPDIR'] = "tmp/chake.#{$SPB_ENV}"
17 ENV['CHAKE_SSH_CONFIG'] = ssh_config_file 17 ENV['CHAKE_SSH_CONFIG'] = ssh_config_file
18 18
19 -ENV['CHAKE_RSYNC_OPTIONS'] ||= ''  
20 -ENV['CHAKE_RSYNC_OPTIONS'] << ' ' << '--exclude backups'  
21 -ENV['CHAKE_RSYNC_OPTIONS'] << ' ' << '--exclude src' 19 +chake_rsync_options = ENV['CHAKE_RSYNC_OPTIONS'].to_s.clone
  20 +chake_rsync_options += ' --exclude backups'
  21 +chake_rsync_options += ' --exclude src'
  22 +ENV['CHAKE_RSYNC_OPTIONS'] = chake_rsync_options
22 23
23 if $SPB_ENV == 'lxc' 24 if $SPB_ENV == 'lxc'
24 system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 | sed -e '/^softwarepublico/ !d; s/softwarepublico_//; s/_[0-9_]*/:/ ' > #{ips_file}.new") 25 system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 | sed -e '/^softwarepublico/ !d; s/softwarepublico_//; s/_[0-9_]*/:/ ' > #{ips_file}.new")