Merge Request #4
← To merge requests
From
centos7
into
master
Commits (1)
-
Support to CentOS 6.5 dropped.
1 participants
Showing
2 changed files
Show diff stats
Vagrantfile
| @@ -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 'centos6.5 (virtualbox)' | 20 | + puts 'centos7.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 "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 | 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' |
vagrant/centos.sh
| @@ -5,23 +5,6 @@ set -ex | @@ -5,23 +5,6 @@ set -ex | ||
| 5 | ### Disable annoying plugin | 5 | ### Disable annoying plugin |
| 6 | sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf | 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 | if [ -n "$http_proxy" ]; then | 9 | if [ -n "$http_proxy" ]; then |
| 27 | # force all repositories to always use the same host to take advantage of a | 10 | # force all repositories to always use the same host to take advantage of a |
| @@ -36,7 +19,7 @@ fi | @@ -36,7 +19,7 @@ fi | ||
| 36 | 19 | ||
| 37 | yum -y groupinstall "Development tools" | 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 | ### Install Virtualenvwrapper | 24 | ### Install Virtualenvwrapper |
| 42 | which pip2.7 > /dev/null || | 25 | which pip2.7 > /dev/null || |
