From 799f1e8e2d6990273f09087eda65b8ae8cf34ae6 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 15 May 2012 12:26:13 +0200 Subject: vagrant: Factor out common build settings Let's factor out some build related settings to a Ruby snippet that can be shared between Rakefile and Vagrantfile. --- Rakefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 307edba..c4c29a9 100644 --- a/Rakefile +++ b/Rakefile @@ -21,6 +21,9 @@ require 'rubygems' require 'vagrant' require 'uri' +$:.unshift File.expand_path('../vagrant/lib', __FILE__) +require 'tails_build_settings' + # Path to the directory which holds our Vagrantfile VAGRANT_PATH = File.expand_path('../vagrant', __FILE__) @@ -30,8 +33,6 @@ EXPORTED_VARIABLES = ['http_proxy', 'MKSQUASHFS_OPTIONS'] # Let's save the http_proxy set before playing with it EXTERNAL_HTTP_PROXY = ENV['http_proxy'] -# Hostname of the virtual machine (must be in /etc/hosts) -VIRTUAL_MACHINE_HOSTNAME = 'squeeze.vagrantup.com' task :parse_build_options do options = '' -- cgit v1.1