← Back to team overview

checkbox-dev team mailing list archive

[PATCH 5/6] Vagrantfile: detect locally-installed apt-cacher-ng

 

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@xxxxxxxxxxxxx>
---
 Vagrantfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7fdcad2..892e8fd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -28,9 +28,16 @@ Vagrant::Config.run do |config|
     config.vm.boot_mode = :gui
   end
 
-  # Setup an apt cache if one is available
   if ENV.key? "VAGRANT_APT_CACHE"
+    # Setup an apt cache if one is available and explicitly configured
     config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  elsif File.exists? "/etc/apt-cacher-ng"
+    # If apt-cacher-ng is installed on this machine then just use it.
+    require 'socket'
+    guessed_address = Socket.ip_address_list.detect{|intf| !intf.ipv4_loopback?}
+    if guessed_address
+      config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"http://#{guessed_address.ip_address}:3142\";; };' > /etc/apt/apt.conf"
+    end
   end
 
   # Provision everything using a standalone shell script
-- 
1.8.5.3



References