Merge pull request #408 from ruebot/issue-405

Use ubuntu/xenial64 over bento/ubuntu-16.04; Address #405.

.gitignore

@@ -3,6 +3,7 @@ cache.properties
 tests/test_config.ini
 install/.vagrant
 install/downloads
+install/ubuntu-xenial-16.04-cloudimg-console.log
 site/
 installer
 composer.phar

.gitmodules

@@ -1,16 +1,20 @@
 [submodule "Crayfish"]
-	path = Crayfish
-	url = https://github.com/Islandora-CLAW/Crayfish
+  path = Crayfish
+  url = https://github.com/Islandora-CLAW/Crayfish
+  branch = master
 [submodule "Alpaca"]
-	path = Alpaca
-	url = https://github.com/Islandora-CLAW/Alpaca
+  path = Alpaca
+  url = https://github.com/Islandora-CLAW/Alpaca
+  branch = master
 [submodule "pdx"]
-	path = pdx
-	url = https://github.com/Islandora-CLAW/pdx
+  path = pdx
+  url = https://github.com/Islandora-CLAW/pdx
+  branch = master
 [submodule "chullo"]
-	path = chullo
-	url = https://github.com/Islandora-CLAW/chullo
+  path = chullo
+  url = https://github.com/Islandora-CLAW/chullo
+  branch = master
 [submodule "islandora"]
-	path = islandora
-	url = https://github.com/Islandora-CLAW/islandora
-	branch = 8.x-1.x
+  path = islandora
+  url = https://github.com/Islandora-CLAW/islandora
+  branch = 8.x-1.x

install/Vagrantfile

@@ -35,7 +35,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "bento/ubuntu-16.04"
+  config.vm.box = "ubuntu/xenial64"
 
   # Setup the shared folder
   home_dir = "/home/vagrant"

install/configs/variables

@@ -13,5 +13,5 @@ SOLR_HOME="/var/lib/tomcat7/solr"
 BLAZEGRAPH_VERSION=2.1.4
 DRUPAL_HOME="/var/www/html/drupal"
 DRUPAL_VERSION=8.1.8
-FITS_VERSION=1.0.2
+FITS_VERSION=1.0.3
 FITS_WS_VERSION=1.1.3

install/scripts/alpaca.sh

@@ -11,8 +11,8 @@ fi
 cd "$HOME_DIR"
 git clone https://github.com/Islandora-CLAW/Alpaca.git
 cd Alpaca
-chown -R vagrant:vagrant "$HOME_DIR/Alpaca"
-sudo -u vagrant ./gradlew build
+chown -R ubuntu:ubuntu "$HOME_DIR/Alpaca"
+sudo -u ubuntu ./gradlew build
 
-# Chown everything over to the vagrant user just in case
-chown -R vagrant:vagrant "$HOME_DIR/Alpaca"
+# Chown everything over to the ubuntu user just in case
+chown -R ubuntu:ubuntu "$HOME_DIR/Alpaca"

install/scripts/bootstrap.sh

@@ -39,7 +39,7 @@ apt-get -y -qq install maven
 
 # Tomcat
 apt-get -y -qq install tomcat7 tomcat7-admin
-usermod -a -G tomcat7 vagrant
+usermod -a -G tomcat7 ubuntu
 sed -i '$i<user username="islandora" password="islandora" roles="manager-gui"/>' /etc/tomcat7/tomcat-users.xml
 
 # Wget and curl

install/scripts/drupal-console.sh

@@ -23,7 +23,7 @@ if [ -f ".console/config.yml" ]; then
   rm .console/config.yml
 fi
 cp $HOME_DIR/islandora/install/configs/config.yml $HOME_DIR/.console/config.yml
-chown -hR vagrant:vagrant /home/vagrant/.console
+chown -hR ubuntu:ubuntu /home/ubuntu/.console
 sed -i -e "\$asource \"$HOME/.console/console.rc\" 2>/dev/null" $HOME/.bashrc
 
 # Fix drupal-console

install/scripts/islandora-microservices.sh

@@ -27,4 +27,4 @@ cp "/opt/microservices/pdx/config/example.settings.yml" "/opt/microservices/pdx/
 cd "/opt/microservices/pdx"
 composer update
 
-chown -hR vagrant:vagrant /opt/microservices
+chown -hR ubuntu:ubuntu /opt/microservices

install/scripts/karaf.sh

@@ -52,9 +52,9 @@ if [ ! -L "/etc/init.d/karaf-service" ]; then
     echo " done"
 fi
 
-# Add the vagrant user's maven repository
+# Add the ubuntu user's maven repository
 if ! grep -q "$HOME_DIR/.m2/repository" $KARAF_DIR/etc/org.ops4j.pax.url.mvn.cfg ; then
-    echo "Adding vagrant user's Maven repository... "
+    echo "Adding ubuntu user's Maven repository... "
     sed -i "s|#org.ops4j.pax.url.mvn.localRepository=|org.ops4j.pax.url.mvn.localRepository=$HOME_DIR/.m2/repository|" $KARAF_DIR/etc/org.ops4j.pax.url.mvn.cfg
     echo " done"
 fi

install/scripts/lamp-server.sh

@@ -6,8 +6,8 @@ PACKAGES="libwrap0 ssl-cert libterm-readkey-perl mysql-client libdbi-perl libmys
 
 apt-get -qq install -y $PACKAGES
 
-usermod -a -G www-data vagrant
+usermod -a -G www-data ubuntu
 
-chown -R vagrant:vagrant islandora
+chown -R ubuntu:ubuntu islandora
 
 sed -i '$idate.timezone=America/Toronto' /etc/php/7.0/cli/php.ini

install/scripts/post-install.sh

@@ -16,7 +16,7 @@ chown -R www-data:www-data /var/www/html
 chmod -R g+w /var/www/html
 
 # Chown the home directory for good measure
-chown -R vagrant:vagrant "$HOME_DIR"
+chown -R ubuntu:ubuntu "$HOME_DIR"
 
 # Fix FITS log
 sed -i 's|log4j.appender.FILE.File=${catalina.home}/logs/fits-service.log|log4j.appender.FILE.File=/var/log/tomcat7/fits-service.log|g' /var/lib/tomcat7/webapps/fits/WEB-INF/classes/log4j.properties