Merging wheezy-packages branch

1 files changed, 52 insertions, 2 deletions

diff --git a/Vagrantfile b/Vagrantfile
index 8c6ac69b..100bcb2a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,8 +9,58 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # 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 = "wheezy"
+  # we need a debian testing vagrantbox because
+  # - currently the useragent debian packages depend on python-cryptography which is only
+  #   available in debian jessie (for the fernet module to create keys)
+  # - the source installation needs npm, which is also only available in debian jessie
+
+  # Please verify the sha512 sum of the downloaded box before importing it into vagrant !
+  # see https://leap.se/en/docs/platform/details/development#Verify.vagrantbox.download
+  # for details
+
+  config.vm.box = "leap-jessie-amd64"
+  config.vm.define "source", primary: true do |source|
+    source.vm.provider "virtualbox" do |v, override|
+      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-debian-jessie-amd64-virtualbox.box"
+    end
+    source.vm.provider "libvirt" do |v, override|
+      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/Debian-jessie.beta1-amd64-netboot.box"
+    end
+    source.vm.provision "puppet" do |puppet|
+      puppet.manifests_path = "provisioning/manifests"
+      puppet.module_path    = "provisioning/modules"
+      puppet.manifest_file  = "source.pp"
+    end
+  end
+
+  config.vm.define "deb", autostart: false do |deb|
+    # until https://github.com/pixelated-project/pixelated-user-agent/issues/226 is not fixed,
+    # we depend on a debian testing box
+
+    config.vm.box = "leap-jessie-amd64"
+    deb.vm.provider "virtualbox" do |v, override|
+      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-debian-jessie-amd64-virtualbox.box"
+    end
+    deb.vm.provider "libvirt" do |v, override|
+      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/Debian-jessie.beta1-amd64-netboot.box"
+    end
+    deb.vm.provision "puppet" do |puppet|
+      puppet.manifests_path = "provisioning/manifests"
+      puppet.module_path    = "provisioning/modules"
+      puppet.manifest_file  = "deb.pp"
+    end
+  end
+
+  config.vm.define "hackday", autostart: false do |hackday|
+    config.vm.box = "hackday-user-agent"
+  end
+
+
+  config.vm.network :forwarded_port, guest: 3333, host: 3333
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 1024
+  end
+>>>>>>> master
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs