Download as
Browse Code »

Commit b867d614c495b7d7834fa980dbcbe53c6fe7df06

Authored by Antonio Terceiro
1 parent 71178d9a
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

script/vagrant: extract APT proxy setup

Showing 2 changed files with 17 additions and 10 deletions   Show diff stats
script/set-apt-proxy 0 → 100644
  Diff comments   View file @b867d61
... ... @@ -0,0 +1,15 @@
  1 +#!/bin/sh
  2 +
  3 +set -e
  4 +
  5 +sudo apt-get install -qy netcat-traditional
  6 +
  7 +# apt-cacher-ng running on the host
  8 +# 10.0.2.2 = host ip on virtualbox/qemu
  9 +# 192.168..122.1 = host ip on default libvirt bridge
  10 +# 172.17.42.1 = host ip on default docker bridge
  11 +for ip in 10.0.2.2 192.168.122.1 172.17.42.1; do
  12 + if nc -z -w 1 $ip 3142; then
  13 + echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
  14 + fi
  15 +done
... ...
script/vagrant
  Diff comments   View file @b867d61
1 1 #!/bin/sh
2 2  
3 3 set -e
4   -sudo apt-get install netcat-traditional
5 4  
6   -# apt-cacher-ng running on the host
7   -# 10.0.2.2 = host ip on virtualbox/qemu
8   -# 192.168..122.1 = host ip on default libvirt bridge
9   -for ip in 10.0.2.2 192.168.122.1; do
10   - if nc -z -w 1 $ip 3142; then
11   - echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
12   - fi
13   -done
  5 +cd /vagrant
  6 +./script/set-apt-proxy
14 7  
15 8 sudo DEBIAN_FRONTEND=noninteractive apt-get install -qy postfix
16 9 sudo postconf virtual_alias_maps=hash:/etc/postfix/virtual
... ... @@ -20,5 +13,4 @@ EOF
20 13 sudo postmap /etc/postfix/virtual
21 14 sudo service postfix reload
22 15  
23   -cd /vagrant
24 16 ./script/quick-start
... ...