Merge pull request AnthonyNystrom#6 from oromero/master

Adjustments

Author: AnthonyNystrom

Vagrantfile

@@ -1,17 +1,27 @@
 
-Vagrant::Config.run do |config|
-  
-  config.vm.box = "PythonDevBootstrapPrecise"
+Vagrant.configure("2") do |config|
+
+  config.vm.box     = 'PythonDevBootstrapPrecise'
   config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+
+  if defined? VagrantVbguest
+    config.vbguest.auto_update = true
+  end
+
   config.ssh.guest_port = 22
-  config.vm.customize ["modifyvm", :id, "--memory", 512]
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    vb.customize ["modifyvm", :id, "--memory", "512"]
+  end
+
+  config.vm.synced_folder "~/Development/Projects", "/projects"
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = "manifests"
+    puppet.manifest_file  = "init.pp"
+    puppet.module_path = "modules"
+    puppet.options = "--verbose --debug"
+    #puppet.options = "--verbose --noop"
+  end
 
-   config.vm.provision :puppet do |puppet|
-     puppet.manifests_path = "manifests"
-     puppet.manifest_file  = "init.pp"
-     puppet.module_path = "modules"
-     puppet.options = "--verbose --debug"
-     #puppet.options = "--verbose --noop"
-   end
-   
-end
+end

manifests/init.pp

@@ -301,13 +301,10 @@
 include networking
 include gui
 include keepuptodate
+include web
+include sql
+include mongodb
 
 #include science
-#include web
 #include pythononwheels
-#include sql
-#include mongodb
-#include elasticsearch
-#include flask
-
-
+#include flask