Download as
Browse Code »

Commit 4c0e7fc8c72a49ef3bc3ac1ffcf1c583ffeedc76

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

Added support to CentOS 7. 

Support to CentOS 6.5 dropped.
Showing 2 changed files with 4 additions and 21 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @4c0e7fc
... ... @@ -17,7 +17,7 @@ if $stdin.isatty
17 17 puts '------------------------------'
18 18 puts 'precise64 (virtualbox)'
19 19 puts 'trusty64 (virtualbox)'
20   - puts 'centos6.5 (virtualbox)'
  20 + puts 'centos7.0 (virtualbox)'
21 21 puts
22 22 print "Which box to use [#{default_box}]: "
23 23 choice = $stdin.gets.strip
... ... @@ -44,8 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
44 44 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
45 45 when "trusty64"
46 46 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
47   - when "centos6.5"
48   - config.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
  47 + when "centos7.0"
  48 + config.vm.box_url = "https://vagrantcloud.com/chef/boxes/centos-7.0/versions/1/providers/virtualbox.box"
49 49 end
50 50  
51 51 config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh'
... ...
vagrant/centos.sh
  Diff comments   View file @4c0e7fc
... ... @@ -5,23 +5,6 @@ set -ex
5 5 ### Disable annoying plugin
6 6 sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
7 7  
8   -### Add PUIAS repo
9   -
10   -yum install curl -y
11   -
12   -if [ ! -f /etc/pki/rpm-gpg/RPM-GPG-KEY-puias ]; then
13   - curl -s http://www.math.ias.edu/data/puias/6/i386/os/RPM-GPG-KEY-puias > /etc/pki/rpm-gpg/RPM-GPG-KEY-puias
14   -fi
15   -
16   -if [ ! -f /etc/yum.repos.d/puias-6-core.repo ]; then
17   - rpm -i --nodeps http://springdale.math.ias.edu/data/puias/6/x86_64/os/Packages/springdale-release-6-6.5.0.45.sdl6.3.x86_64.rpm --replacefiles
18   -
19   - rpm -i --nodeps http://springdale.math.ias.edu/data/puias/6/x86_64/os/Packages/springdale-core-6-2.sdl6.10.noarch.rpm
20   -fi
21   -
22   -if [ ! -f /etc/yum.repos.d/puias-6-computational.repo ]; then
23   - yum install springdale-computational -y
24   -fi
25 8  
26 9 if [ -n "$http_proxy" ]; then
27 10 # force all repositories to always use the same host to take advantage of a
... ... @@ -36,7 +19,7 @@ fi
36 19  
37 20 yum -y groupinstall "Development tools"
38 21  
39   -yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python27 python27-devel postgresql-server
  22 +yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python-devel postgresql-server
40 23  
41 24 ### Install Virtualenvwrapper
42 25 which pip2.7 > /dev/null ||
... ...