Skip to content

Commit

Permalink
Update to 16.04 LTS, and PHP7; Address #181. (#323)
Browse files Browse the repository at this point in the history
* Add FITS Web Service; Address #309.
* Update to 16.04 LTS, and PHP7; Address #181.
  • Loading branch information
ruebot authored and whikloj committed Aug 16, 2016
1 parent 56c6cfb commit f942941
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 39 deletions.
3 changes: 1 addition & 2 deletions install/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "ubuntu/trusty64"
config.vm.box = "bento/ubuntu-16.04"

# Setup the shared folder
home_dir = "/home/vagrant"
Expand All @@ -72,7 +72,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :shell, :path => "./scripts/fits.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/solr.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/twigcextensions.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/drupal.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/fcrepo.sh", :args => home_dir
config.vm.provision :shell, :path => "./scripts/blazegraph.sh", :args => home_dir
Expand Down
24 changes: 5 additions & 19 deletions install/scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ export DEBIAN_FRONTEND=noninteractive

cp "$HOME_DIR"/islandora/install/configs/motd /etc/motd

# Add repo for Oracle's JDK 8, rationale #L36-38
add-apt-repository -y ppa:webupd8team/java
# Add repo for PHP 5.6
add-apt-repository -y ppa:ondrej/php

# Update all the things.
apt-get -y -qq update && apt-get -y -qq upgrade

Expand All @@ -35,18 +30,9 @@ apt-get -y -qq install build-essential
apt-get -y -qq install git vim

# Java
## There is no Java8 OpenJDK right now in the Ubuntu repos
## http://askubuntu.com/questions/464755/how-to-install-openjdk-8-on-14-04-lts
## We'll use Oracle Java8 for now.
# Java (Oracle)
apt-get -qq install -y software-properties-common
apt-get -qq install -y python-software-properties
echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections
apt-get -qq install -y oracle-java8-installer
update-java-alternatives -s java-8-oracle
apt-get -qq install -y oracle-java8-set-default
export JAVA_HOME=/usr/lib/jvm/java-8-oracle
apt-get -y install openjdk-8-jdk openjdk-8-jdk-headless openjdk-8-jre
sed -i '$iJAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64' /etc/environment
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

# Maven
apt-get -y -qq install maven
Expand All @@ -66,7 +52,7 @@ MAN_FILES=$(wget -qO- "http://sourceforge.net/projects/zsh/files/zsh/5.0.2/zsh-5
for MAN_FILE in $MAN_FILES; do gzip /usr/share/man/man1/"${MAN_FILE##*/}"; done

# More helpful packages
apt-get -y -qq install htop tree zsh fish
apt-get -y -qq install htop tree zsh fish unzip

# Set some params so it's non-interactive for the lamp-server install
debconf-set-selections <<< 'mysql-server mysql-server/root_password password islandora'
Expand All @@ -75,4 +61,4 @@ debconf-set-selections <<< "postfix postfix/mailname string islandora-fedora4.or
debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"

# Set JAVA_HOME -- Java8 set-default does not seem to do this.
sed -i 's|#JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk|JAVA_HOME=/usr/lib/jvm/java-8-oracle|g' /etc/default/tomcat7
sed -i 's|#JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk|JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64|g' /etc/default/tomcat7
1 change: 0 additions & 1 deletion install/scripts/composer.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash
echo "Installing Composer"

apt-get install -y php5.6-mbstring php5.6-dev
curl -sS https://getcomposer.org/installer | php
php composer.phar install --no-progress
mv composer.phar /usr/local/bin/composer
2 changes: 1 addition & 1 deletion install/scripts/drupal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
cd "$HOME_DIR"

# Drush and drupal deps
apt-get -y -qq install php5.6-gd php5.6-xml php5.6-mysql php5.6-curl php5.6-json php-stomp
apt-get -y -qq install php7.0-gd php7.0-xml php7.0-mysql php7.0-curl php7.0-json php-stomp
cd /tmp && wget http://files.drush.org/drush.phar
chmod +x drush.phar
mv drush.phar /usr/local/bin/drush
Expand Down
1 change: 1 addition & 0 deletions install/scripts/islandora-karaf-components.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
fi

echo "Installing Islandora Sync Gateway"
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
$KARAF_CLIENT -f $KARAF_CONFIGS/islandora_sync_gateway.script
sleep 10
echo "Installing Islandora Triplestore Indexer"
Expand Down
6 changes: 2 additions & 4 deletions install/scripts/karaf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ echo "Symlinking Apache Karaf... "
ln -s "/opt/apache-karaf-$KARAF_VERSION" $KARAF_DIR
echo " done"


if [ ! -L "/etc/init.d/karaf-service" ]; then
echo "Installing Karaf as a service... "
# Run a setup script to add some feature repos and prepare it for running as a service
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
$KARAF_DIR/bin/start
sleep 60
`${KARAF_CLIENT} -f ${KARAF_CONFIGS}/karaf_service.script`
Expand Down Expand Up @@ -71,6 +71,4 @@ fi
echo "Starting Karaf as a service... "
service karaf-service start
sleep 60
echo "done"


echo " done"
2 changes: 1 addition & 1 deletion install/scripts/lamp-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

echo "Installing LAMP server packages"

PACKAGES="libwrap0 ssl-cert libterm-readkey-perl mysql-client-5.5 libdbi-perl libmysqlclient18 mysql-server-core-5.5 mysql-common apache2 mysql-server-5.5 mysql-client-core-5.5 tcpd libaio1 mysql-server libdbd-mysql-perl libhtml-template-perl php5.6 libapache2-mod-php5.6"
PACKAGES="libwrap0 ssl-cert libterm-readkey-perl mysql-client libdbi-perl libmysqlclient20 mysql-client-core-5.7 mysql-common apache2 mysql-server mysql-server-core-5.7 tcpd libaio1 mysql-server libdbd-mysql-perl libhtml-template-perl php7.0 php7.0-dev libapache2-mod-php7.0 php7.0-mbstring"

apt-get -qq install -y $PACKAGES

Expand Down
11 changes: 0 additions & 11 deletions install/scripts/twigcextensions.sh

This file was deleted.

0 comments on commit f942941

Please sign in to comment.