From 8e7bef230dbf85db4f8641f27eeee4c4936d4371 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@datavibe.net>
Date: Tue, 5 Aug 2014 00:45:14 +0200
Subject: [PATCH] updated vagrant default dir

---
 osxbackup/remotebackup.command  |  5 ---
 vagrantfile-default/Makefile    | 24 ++++++++++---
 vagrantfile-default/Vagrantfile | 61 +++++++++++++++++++++++++++++----
 vagrantfile-default/init.sh     |  6 ----
 4 files changed, 73 insertions(+), 23 deletions(-)
 delete mode 100755 osxbackup/remotebackup.command
 delete mode 100644 vagrantfile-default/init.sh

diff --git a/osxbackup/remotebackup.command b/osxbackup/remotebackup.command
deleted file mode 100755
index 240390b..0000000
--- a/osxbackup/remotebackup.command
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-HOSTNAME="`hostname -s`"
-export RBACKUPDEST="s3+http://${HOSTNAME}.duplicitybackup"
-source backup.command
diff --git a/vagrantfile-default/Makefile b/vagrantfile-default/Makefile
index 8282459..be4ec88 100644
--- a/vagrantfile-default/Makefile
+++ b/vagrantfile-default/Makefile
@@ -1,7 +1,21 @@
-default: up
+UPKGS := build-essential 
 
-up: destroy
-		vagrant up
+default: login
 
-destroy:
-		vagrant destroy -f
+login: up
+	vagrant ssh -c 'sudo envdir /etc/env su - root'
+
+up:
+	vagrant up
+
+provision:
+	vagrant provision
+
+clean:
+	vagrant destroy -f
+	rm -rf .vagrant
+
+inside:
+	apt-get remove -y chef* puppet*
+	apt-get install -y $(UPKGS)
+	# DO STUFF HERE
diff --git a/vagrantfile-default/Vagrantfile b/vagrantfile-default/Vagrantfile
index 1d3c21b..05054ca 100644
--- a/vagrantfile-default/Vagrantfile
+++ b/vagrantfile-default/Vagrantfile
@@ -18,17 +18,58 @@ def get_internet_ifname()
     return nil
 end
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) 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.
+SETUP_BASE = <<ENDPROVISION
+#!/bin/bash
 
-  # Every Vagrant virtual environment requires a box to build off of.
+fallocate -l 10G /swapfile
+mkswap /swapfile
+swapon /swapfile
+
+# first do updates
+export DEBIAN_FRONTEND=noninteractive
+
+if [ -e /mirror/ ] ; then
+cat > /etc/apt/sources.list <<EOF
+deb file:///mirror/ trusty main restricted universe multiverse
+deb file:///mirror/ trusty-updates main restricted universe multiverse
+deb file:///mirror/ trusty-backports main restricted universe multiverse
+deb file:///mirror/ trusty-security main restricted universe multiverse
+EOF
+else
+cat > /etc/apt/sources.list <<EOF
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-updates main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-backports main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-security main restricted universe multiverse
+EOF
+fi
+apt-get update
+apt-get -y upgrade
+apt-get -y install daemontools # the only thing that gets preinstalled
+
+mkdir /etc/env
+envdir /etc/env bash -l -c "cd /vagrant && make inside"
+ENDPROVISION
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "trusty64"
   config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/" + \
     "trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
   # config.vm.network "forwarded_port", guest: 80, host: 8080
 
+  if ENV['OSX_LOCAL_UBUNTU_MIRROR']
+    if File.exists? File.expand_path(ENV['OSX_LOCAL_UBUNTU_MIRROR'])
+        config.vm.synced_folder \
+        File.expand_path(ENV['OSX_LOCAL_UBUNTU_MIRROR']), \
+        "/mirror/", \
+        mount_options: [ 'ro' ]
+    end
+  end
+
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.auto_detect = true
+  end
+
   config.vm.synced_folder \
     "~/Library/Caches/ubuntu-14.04-apt-archives/", \
     "/var/cache/apt/archives/", \
@@ -37,9 +78,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network "public_network", bridge: get_internet_ifname()
 
   config.vm.provider "virtualbox" do |vb|
-  #   vb.gui = true
+  # vb.gui = true
+    vb.customize ["modifyvm", :id, "--ioapic", "on"]
+    vb.customize ["modifyvm", :id, "--cpus", "8"]
     vb.customize ["modifyvm", :id, "--memory", "4096"]
   end
 
-  config.vm.provision "shell", path: "init.sh"
+  # we need host key ssh for berkshelf fetching
+  # cookbooks from git private repos
+  config.ssh.forward_agent = true
+
+  config.vm.provision "shell", inline: SETUP_BASE
 end
diff --git a/vagrantfile-default/init.sh b/vagrantfile-default/init.sh
deleted file mode 100644
index 3530c38..0000000
--- a/vagrantfile-default/init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get -y upgrade
-cd /vagrant && make inside