Download as
Browse Code »

Commit 98e7ef45236be00c55ac0f1c241d888e9c31c435

Authored by Sergio Oliveira
1 parent 9fadcb74
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Updated ubuntu version and port configuration

Showing 1 changed file with 51 additions and 17 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @98e7ef4
... ... @@ -10,29 +10,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
10 10 # please see the online documentation at vagrantup.com.
11 11  
12 12 # Every Vagrant virtual environment requires a box to build off of.
13   - config.vm.box = "precise64"
  13 + config.vm.box = "trusty64"
14 14  
15 15 # The url from where the 'config.vm.box' box will be fetched if it
16 16 # doesn't already exist on the user's system.
17   - config.vm.box_url = "http://files.vagrantup.com/precise64.box"
  17 + config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
18 18  
19 19 # Create a forwarded port mapping which allows access to a specific port
20 20 # within the machine from a port on the host machine. In the example below,
21 21 # accessing "localhost:8080" will access port 80 on the guest machine.
22 22 config.vm.network :forwarded_port, guest: 80, host: 8080
23   - config.vm.network :forwarded_port, guest: 7000, host: 8000
  23 + config.vm.network :forwarded_port, guest: 8000, host: 8000
24 24 config.vm.network :forwarded_port, guest: 5280, host: 5280
25 25 config.vm.network :forwarded_port, guest: 8080, host: 8081
26 26 config.vm.network :forwarded_port, guest: 8983, host: 8983
27 27  
28 28 # Create a private network, which allows host-only access to the machine
29 29 # using a specific IP.
30   - # config.vm.network :private_network, ip: "192.168.33.10"
  30 + config.vm.network "private_network", ip: "192.168.33.10"
31 31  
32 32 # Create a public network, which generally matched to bridged network.
33 33 # Bridged networks make the machine appear as another physical device on
34 34 # your network.
35   - # config.vm.network :public_network
  35 + # config.vm.network "public_network"
36 36  
37 37 # If true, then any SSH connections made will enable agent forwarding.
38 38 # Default value: false
... ... @@ -43,23 +43,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
43 43 # the path on the guest to mount the folder. And the optional third
44 44 # argument is a set of non-required options.
45 45 # config.vm.synced_folder "../data", "/vagrant_data"
  46 + config.vm.synced_folder ".", "/vagrant", type: "nfs"
46 47  
47 48 # Provider-specific configuration so you can fine-tune various
48 49 # backing providers for Vagrant. These expose provider-specific options.
49 50 # Example for VirtualBox:
50 51 #
51   - config.vm.provider :virtualbox do |vb|
  52 + config.vm.provider "virtualbox" do |vb|
52 53 # # Don't boot with headless mode
53 54 # vb.gui = true
54   -
55   - # Use VBoxManage to customize the VM. For example to change memory:
56   - vb.customize ["modifyvm", :id, "--memory", "1024"]
  55 + #
  56 + # # Use VBoxManage to customize the VM. For example to change memory:
  57 + vb.customize ["modifyvm", :id, "--memory", "1024"]
57 58 end
58 59 #
59 60 # View the documentation for the provider you're using for more
60 61 # information on available options.
61   -
62   - config.vm.provision :shell, :path => "puppet/bootstrap.sh"
63 62  
64 63 # Enable provisioning with Puppet stand alone. Puppet manifests
65 64 # are contained in a directory path relative to this Vagrantfile.
... ... @@ -79,11 +78,46 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
79 78 # # Managed by Puppet.\n"
80 79 # # }
81 80 #
82   - config.vm.provision :puppet do |puppet|
83   - puppet.module_path = "puppet/modules"
84   - puppet.manifests_path = "puppet/manifests"
85   - puppet.manifest_file = "init.pp"
86   - end
  81 + # config.vm.provision "puppet" do |puppet|
  82 + # puppet.manifests_path = "manifests"
  83 + # puppet.manifest_file = "site.pp"
  84 + # end
  85 +
  86 + # Enable provisioning with chef solo, specifying a cookbooks path, roles
  87 + # path, and data_bags path (all relative to this Vagrantfile), and adding
  88 + # some recipes and/or roles.
  89 + #
  90 + # config.vm.provision "chef_solo" do |chef|
  91 + # chef.cookbooks_path = "../my-recipes/cookbooks"
  92 + # chef.roles_path = "../my-recipes/roles"
  93 + # chef.data_bags_path = "../my-recipes/data_bags"
  94 + # chef.add_recipe "mysql"
  95 + # chef.add_role "web"
  96 + #
  97 + # # You may also specify custom JSON attributes:
  98 + # chef.json = { :mysql_password => "foo" }
  99 + # end
87 100  
88   - config.vm.provision :shell, :path => "puppet/colab-key.sh"
  101 + # Enable provisioning with chef server, specifying the chef server URL,
  102 + # and the path to the validation key (relative to this Vagrantfile).
  103 + #
  104 + # The Opscode Platform uses HTTPS. Substitute your organization for
  105 + # ORGNAME in the URL and validation key.
  106 + #
  107 + # If you have your own Chef Server, use the appropriate URL, which may be
  108 + # HTTP instead of HTTPS depending on your configuration. Also change the
  109 + # validation key to validation.pem.
  110 + #
  111 + # config.vm.provision "chef_client" do |chef|
  112 + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
  113 + # chef.validation_key_path = "ORGNAME-validator.pem"
  114 + # end
  115 + #
  116 + # If you're using the Opscode platform, your validator client is
  117 + # ORGNAME-validator, replacing ORGNAME with your organization name.
  118 + #
  119 + # If you have your own Chef Server, the default validation client name is
  120 + # chef-validator, unless you changed the configuration.
  121 + #
  122 + # chef.validation_client_name = "ORGNAME-validator"
89 123 end
... ...