Switch to unified view

a/vagrant/Vagrantfile b/vagrant/Vagrantfile
...
...
5
  # All Vagrant configuration is done here. The most common configuration
5
  # All Vagrant configuration is done here. The most common configuration
6
  # options are documented and commented below. For a complete reference,
6
  # options are documented and commented below. For a complete reference,
7
  # please see the online documentation at vagrantup.com.
7
  # please see the online documentation at vagrantup.com.
8
8
9
  # Every Vagrant virtual environment requires a box to build off of.
9
  # Every Vagrant virtual environment requires a box to build off of.
10
  config.vm.box = "ubuntu-1110-server-amd64"
10
  config.vm.box = "ubuntu-1204-server-amd64"
11
11
12
  # The url from where the 'config.vm.box' box will be fetched if it
12
  # The url from where the 'config.vm.box' box will be fetched if it
13
  # doesn't already exist on the user's system.
13
  # doesn't already exist on the user's system.
14
  # config.vm.box_url = "http://domain.com/path/to/above.box"
14
  # config.vm.box_url = "http://domain.com/path/to/above.box"
15
15
...
...
38
  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
38
  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
39
39
40
  # Enable provisioning with Puppet stand alone.  Puppet manifests
40
  # Enable provisioning with Puppet stand alone.  Puppet manifests
41
  # are contained in a directory path relative to this Vagrantfile.
41
  # are contained in a directory path relative to this Vagrantfile.
42
  # You will need to create the manifests directory and a manifest in
42
  # You will need to create the manifests directory and a manifest in
43
  # the file ubuntu-1110-server-amd64.pp in the manifests_path directory.
43
  # the file ubuntu-1204-server-amd64.pp in the manifests_path directory.
44
  #
44
  #
45
  # An example Puppet manifest to provision the message of the day:
45
  # An example Puppet manifest to provision the message of the day:
46
  #
46
  #
47
  # # group { "puppet":
47
  # # group { "puppet":
48
  # #   ensure => "present",
48
  # #   ensure => "present",
...
...
55
  # #               Managed by Puppet.\n"
55
  # #               Managed by Puppet.\n"
56
  # # }
56
  # # }
57
  #
57
  #
58
  config.vm.provision :puppet do |puppet|
58
  config.vm.provision :puppet do |puppet|
59
    puppet.manifests_path = "manifests"
59
    puppet.manifests_path = "manifests"
60
    puppet.manifest_file  = "ubuntu-1110-server-amd64.pp"
60
    puppet.manifest_file  = "ubuntu-1204-server-amd64.pp"
61
  end
61
  end
62
62
63
  config.vm.provision :shell, :path => "allura_setup.sh"
63
  config.vm.provision :shell, :path => "allura_setup.sh"
64
64
65
  # Enable provisioning with chef solo, specifying a cookbooks path, roles
65
  # Enable provisioning with chef solo, specifying a cookbooks path, roles