Download as
Browse Code »

Commit 653292a15bb798ba84747ea7ca152df16c6f241a

Authored by Sergio Oliveira
1 parent 1c8339ab
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

Changed VM base names

Showing 1 changed file with 7 additions and 10 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @653292a
... ... @@ -2,11 +2,11 @@
2 2 # vi: set ft=ruby :
3 3  
4 4 # CHOOSE THE DISTRO FOR COLAB VM (set the distro variable):
5   -# - ubuntu_precise
6   -# - ubuntu_trusty
7   -# - centos_65
  5 +# - precise64
  6 +# - trusty64
  7 +# - centos6.5
8 8  
9   -distro = "centos_65"
  9 +distro = "precise64"
10 10  
11 11 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
12 12 VAGRANTFILE_API_VERSION = "2"
... ... @@ -22,14 +22,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
22 22  
23 23 colab.vm.box = distro
24 24  
25   - if distro == "ubuntu_precise"
26   - puts "Installing Ubuntu Precise VM!"
  25 + if distro == "precise64"
27 26 colab.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
28   - elsif distro == "ubuntu_trusty"
29   - puts "Installing Ubuntu Trusty VM!"
  27 + elsif distro == "trusty64"
30 28 colab.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
31   - elsif distro == "centos_65"
32   - puts "Installing CentOS 6.5 VM!"
  29 + elsif distro == "centos6.5"
33 30 colab.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
34 31 end
35 32  
... ...