Download as
Browse Code »

Commit f2f58313bad6342cb8da53310729f7daccbec209

Authored by Antonio Terceiro
1 parent c153ab2b
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

util/debian-install: fix installing wheezy

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
util/debian-install/Vagrantfile
  Diff comments   View file @f2f5831
... ... @@ -27,7 +27,7 @@ else
27 27 end
28 28  
29 29 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
30   - config.vm.box = "debian-wheezy"
  30 + config.vm.box = "debian/wheezy64"
31 31 config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact
32 32 config.vm.provision :shell, path: 'test'
33 33 end
... ...
util/debian-install/install
  Diff comments   View file @f2f5831
... ... @@ -8,7 +8,7 @@ if [ -n "$1" ]; then
8 8 fi
9 9  
10 10 set -e
11   -sudo apt-get install -qy netcat-traditional shunit2
  11 +sudo apt-get install -qy netcat-traditional shunit2 curl
12 12  
13 13 # apt-cacher-ng running on the host
14 14 # 10.0.2.2 = host ip on virtualbox/qemu
... ... @@ -68,7 +68,7 @@ deb http://download.noosfero.org/debian/$REPOSITORY ./
68 68 deb-src http://download.noosfero.org/debian/$REPOSITORY ./
69 69 EOF
70 70  
71   -sed -e "s/$DISTRO/&-backports/" \
  71 +sed -e "/security/d; s/$DISTRO/&-backports/" \
72 72 /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
73 73  
74 74 export DEBIAN_FRONTEND=noninteractive
... ...