[tor-commits] [ooni-probe/master] Vagrantfile now using setup-dependencies.sh

art at torproject.org art at torproject.org
Thu Aug 15 17:29:47 UTC 2013


commit 34243f764416716c10d8e9d5cbd39b404920cc34
Author: fh <fh-github at fholzhauer.de>
Date:   Thu Jul 25 17:38:02 2013 +0200

    Vagrantfile now using setup-dependencies.sh
---
 Vagrantfile |  131 +++--------------------------------------------------------
 1 file changed, 6 insertions(+), 125 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 897838f..1434fd2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,145 +5,26 @@ Vagrant.configure("2") do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "precise32"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
   config.vm.box_url = "http://files.vagrantup.com/precise32.box"
 
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network :forwarded_port, guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network :private_network, ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network :public_network
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
   config.vm.synced_folder ".", "/data/ooniprobe"
 
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
-  #
-  # View the documentation for the provider you're using for more
-  # information on available options.
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file base.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "init.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding
-  # some recipes and/or roles.
-  #
-  # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # If you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
 end
 
 $script = <<SCRIPT
-apt-get -y install curl python-setuptools python-dev
-
-echo "Installing Tor..."
-
-echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list
-
-gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
-gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
-
 apt-get update
-apt-get -y install deb.torproject.org-keyring tor tor-geoipdb
-
-apt-get -y install git-core python python-pip python-dev build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython python-virtualenv virtualenvwrapper tor tor-geoipdb libpcap-dev
-
-echo "Updating to the latest version of PIP"
-cd /tmp/
-
-curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
-python ./get-pip.py  ## pip (>=1.3.0) is recommended for security reasons
-
-update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0
+apt-get -y install curl python-setuptools python-dev python-software-properties python-virtualenv virtualenvwrapper vim
 
 cd /data/ooniprobe
+./setup-dependencies.sh
 
-echo "Installing dependencies"
-pip install pyrex
-pip install -r requirements.txt
+echo "source ~/.virtualenvs/ooniprobe/bin/activate" >> ~root/.bashrc
 
-echo "Installing ooniprobe"
-python setup.py install
+mkdir -p ~/.ooni
+cp /data/ooniprobe/data/ooniprobe.conf.sample ~/.ooni/ooniprobe.conf
 
-cd /usr/share/ooni/
-make geoip
+echo Login using 'vagrant ssh', and dont forget to run ooniprobe as root.
 
 SCRIPT
 
diff --git a/setup-dependencies.sh b/setup-dependencies.sh
old mode 100644
new mode 100755





More information about the tor-commits mailing list