Merge remote-tracking branch 'IQSS/develop' into DDN-184-DOI-interface

IQSS · Aug 5, 2016 · 3d87237 · 3d87237
2 parents c4c246f + e31b7d5
commit 3d87237
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -15,6 +15,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       puts "OPERATING_SYSTEM environment variable not specified. Using #{operating_system} by default.\nTo specify it in bash: export OPERATING_SYSTEM=debian"
       config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-puppet.box"
       config.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box"
+    elsif ENV['OPERATING_SYSTEM'] == 'centos7'
+      puts "WARNING: CentOS 7 specified. Newer than what the dev team tests on."
+      config.vm.box_url = "https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.2-64-puppet/versions/1.0.1/providers/virtualbox.box"
+      config.vm.box = "puppetlabs-centos-7.2-64-puppet-1.0.1-virtualbox.box"
+      standalone.vm.box = "puppetlabs-centos-7.2-64-puppet-1.0.1-virtualbox.box"
     elsif ENV['OPERATING_SYSTEM'] == 'debian'
       puts "WARNING: Debian specified. Here be dragons! https://github.com/IQSS/dataverse/issues/1059"
       config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box"

diff --git a/...tatic/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm b/...tatic/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm
diff --git a/doc/sphinx-guides/source/installation/r-rapache-tworavens.rst b/doc/sphinx-guides/source/installation/r-rapache-tworavens.rst
@@ -53,7 +53,9 @@ install rApache as follows::
 	yum install libapreq2
 	rpm -ivh http://mirror.hmdc.harvard.edu/HMDC-Public/RedHat-6/rapache-1.2.6-rpm0.x86_64.rpm
 
+If you are using RHEL/CentOS 7, you can `download an experimental rapache-1.2.7-rpm0.x86_64.rpm <../_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm>`_ and install it with::
 
+	rpm -ivh rapache-1.2.7-rpm0.x86_64.rpm
 
 d. Install libcurl-devel:
 -------------------------

diff --git a/scripts/rapache/build.sh b/scripts/rapache/build.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+mkdir -p ~/rpmbuild/SOURCES
+mkdir -p ~/rpmbuild/SPECS
+wget https://github.com/jeffreyhorner/rapache/archive/v1.2.7.tar.gz -O rapache-1.2.7.tar.gz
+tar xzvf rapache-1.2.7.tar.gz rapache-1.2.7/rpm/rapache.spec --strip-components 2
+# Move to build dirs
+cp -f rapache-1.2.7.tar.gz ~/rpmbuild/SOURCES/
+cp -f rapache.spec ~/rpmbuild/SPECS/
+cd ~
+rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
diff --git a/scripts/vagrant/rpmbuild.sh b/scripts/vagrant/rpmbuild.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-7.noarch.rpm
+yum install -y rpm-build httpd-devel libapreq2-devel R-devel