Download as
Browse Code »

Commit da1581672c593524d30ea8596c86109cd93945c5

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

Fixed centos7.0 box for vagrant. 

Fixes #7
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # CHOOSE THE DISTRO FOR COLAB VM (set the distro variable): 4 # CHOOSE THE DISTRO FOR COLAB VM (set the distro variable):
5 # - precise64 5 # - precise64
6 # - trusty64 6 # - trusty64
7 -# - centos6.5 7 +# - chef/centos-7.0
8 8
9 default_box = "precise64" 9 default_box = "precise64"
10 if $stdin.isatty 10 if $stdin.isatty
@@ -17,7 +17,7 @@ if $stdin.isatty @@ -17,7 +17,7 @@ if $stdin.isatty
17 puts '------------------------------' 17 puts '------------------------------'
18 puts 'precise64 (virtualbox)' 18 puts 'precise64 (virtualbox)'
19 puts 'trusty64 (virtualbox)' 19 puts 'trusty64 (virtualbox)'
20 - puts 'centos7.0 (virtualbox)' 20 + puts 'chef/centos-7.0 (virtualbox)'
21 puts 21 puts
22 print "Which box to use [#{default_box}]: " 22 print "Which box to use [#{default_box}]: "
23 choice = $stdin.gets.strip 23 choice = $stdin.gets.strip
@@ -44,8 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -44,8 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
44 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box" 44 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
45 when "trusty64" 45 when "trusty64"
46 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" 46 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
47 - when "centos7.0"  
48 - config.vm.box_url = "https://vagrantcloud.com/chef/boxes/centos-7.0/versions/1/providers/virtualbox.box" 47 + when "chef/centos-7.0"
  48 + config.vm.box_url = "chef/centos-7.0"
49 end 49 end
50 50
51 config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh' 51 config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh'