diff --git a/Vagrantfile b/Vagrantfile index 1c7e4db..6bdd680 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,7 +17,7 @@ if $stdin.isatty puts '------------------------------' puts 'precise64 (virtualbox)' puts 'trusty64 (virtualbox)' - puts 'centos6.5 (virtualbox)' + puts 'centos7.0 (virtualbox)' puts print "Which box to use [#{default_box}]: " choice = $stdin.gets.strip @@ -44,8 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box" when "trusty64" config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - when "centos6.5" - config.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box" + when "centos7.0" + config.vm.box_url = "https://vagrantcloud.com/chef/boxes/centos-7.0/versions/1/providers/virtualbox.box" end config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh' diff --git a/vagrant/centos.sh b/vagrant/centos.sh index 4961a93..aa45e4d 100755 --- a/vagrant/centos.sh +++ b/vagrant/centos.sh @@ -5,23 +5,6 @@ set -ex ### Disable annoying plugin sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf -### Add PUIAS repo - -yum install curl -y - -if [ ! -f /etc/pki/rpm-gpg/RPM-GPG-KEY-puias ]; then - curl -s http://www.math.ias.edu/data/puias/6/i386/os/RPM-GPG-KEY-puias > /etc/pki/rpm-gpg/RPM-GPG-KEY-puias -fi - -if [ ! -f /etc/yum.repos.d/puias-6-core.repo ]; then - 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 - - rpm -i --nodeps http://springdale.math.ias.edu/data/puias/6/x86_64/os/Packages/springdale-core-6-2.sdl6.10.noarch.rpm -fi - -if [ ! -f /etc/yum.repos.d/puias-6-computational.repo ]; then - yum install springdale-computational -y -fi if [ -n "$http_proxy" ]; then # force all repositories to always use the same host to take advantage of a @@ -36,7 +19,7 @@ fi yum -y groupinstall "Development tools" -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 +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 ### Install Virtualenvwrapper which pip2.7 > /dev/null || -- libgit2 0.21.2