Adjust paths for vagrant scripts (#1)

Author: whikloj

Vagrantfile

@@ -39,7 +39,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Setup the shared folder
   home_dir = "/home/ubuntu"
-  config.vm.synced_folder "../", home_dir + "/islandora"
+  config.vm.synced_folder ".", home_dir + "/islandora"
 
   config.vm.network :forwarded_port, guest: 8080, host: 8080 # Tomcat
   config.vm.network :forwarded_port, guest: 8181, host: 8181 # Karaf

configs/variables

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 HOME_DIR=$1
-DOWNLOAD_DIR="$HOME_DIR/islandora/install/downloads"
+DOWNLOAD_DIR="$HOME_DIR/islandora/downloads"
 FEDORA_VERSION=4.7.0
 KARAF_VERSION=4.0.5
 KARAF_DIR="/opt/karaf"
 KARAF_CLIENT="$KARAF_DIR/bin/client"
-KARAF_CONFIGS="$HOME_DIR/islandora/install/configs/karaf/"
+KARAF_CONFIGS="$HOME_DIR/islandora/configs/karaf/"
 CAMEL_VERSION=4.4.0
 SOLR_VERSION=6.2.1
 BLAZEGRAPH_VERSION=2.1.4

scripts/alpaca.sh

@@ -4,8 +4,8 @@ echo "Building Alpaca"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 cd "$HOME_DIR"

scripts/blazegraph.sh

@@ -3,8 +3,8 @@ echo "Installing BlazeGraph's NanoSparqlServer"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$DOWNLOAD_DIR/bigdata-$BLAZEGRAPH_VERSION.war" ]; then

scripts/bootstrap.sh

@@ -2,8 +2,8 @@
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -d "$DOWNLOAD_DIR" ]; then
@@ -15,7 +15,7 @@ cd "$HOME_DIR"
 # Set apt-get for non-interactive mode
 export DEBIAN_FRONTEND=noninteractive
 
-cp "$HOME_DIR"/islandora/install/configs/motd /etc/motd
+cp "$HOME_DIR"/islandora/configs/motd /etc/motd
 
 # Update all the things.
 apt-get -y -qq update && apt-get -y -qq upgrade

scripts/config.sh

@@ -2,8 +2,8 @@
 echo "Deploying Karaf Configuration"
 
 HOME_DIR=$1
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$KARAF_DIR/etc/org.fcrepo.camel.indexing.triplestore.cfg" ]; then

scripts/drupal-console.sh

@@ -4,8 +4,8 @@ echo "Installing Drupal Console."
 
 HOME_DIR=$1                    
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 cd /tmp
@@ -22,7 +22,7 @@ fi
 if [ -f ".console/config.yml" ]; then
   rm .console/config.yml
 fi
-cp $HOME_DIR/islandora/install/configs/config.yml $HOME_DIR/.console/config.yml
+cp $HOME_DIR/islandora/configs/config.yml $HOME_DIR/.console/config.yml
 chown -hR ubuntu:ubuntu /home/ubuntu/.console
 sed -i -e "\$asource \"$HOME/.console/console.rc\" 2>/dev/null" $HOME/.bashrc
 

scripts/drupal.sh

@@ -4,8 +4,8 @@ echo "Installing Drupal."
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 cd "$HOME_DIR"

scripts/fcrepo-camel-toolbox.sh

@@ -3,8 +3,8 @@ echo "Installing fcrepo-camel-toolbox"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 echo "Installing fcrepo-indexing-triplestore"

scripts/fcrepo.sh

@@ -3,8 +3,8 @@ echo "Installing Fedora."
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$DOWNLOAD_DIR/fcrepo-$FEDORA_VERSION.war" ]; then
@@ -20,8 +20,8 @@ fi
 
 cd /opt
 mkdir -p fcrepo/configs
-cp -v $HOME_DIR/islandora/install/configs/repository.json /opt/fcrepo/configs
-cp -v $HOME_DIR/islandora/install/configs/claw.cnd /opt/fcrepo/configs
+cp -v $HOME_DIR/islandora/configs/repository.json /opt/fcrepo/configs
+cp -v $HOME_DIR/islandora/configs/claw.cnd /opt/fcrepo/configs
 chown -hR tomcat7:tomcat7 /opt/fcrepo
 
 chown tomcat7:tomcat7 /var/lib/tomcat7/fcrepo4-data

scripts/fits.sh

@@ -3,8 +3,8 @@ echo "Installing FITS Web Service and FITS"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$DOWNLOAD_DIR/fits-$FITS_VERSION.zip" ]; then

scripts/islandora-karaf-components.sh

@@ -3,8 +3,8 @@ echo "Installing Islandora Karaf Components"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

scripts/karaf.sh

@@ -3,8 +3,8 @@ echo "Installing Karaf"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$DOWNLOAD_DIR/apache-karaf-${KARAF_VERSION}.tar.gz" ]; then

scripts/loris.sh

@@ -3,8 +3,8 @@ echo "Installing Loris IIIF Image Server"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 # Kakadu
@@ -43,8 +43,8 @@ pip install mock
 pip install responses
 useradd -d /var/www/loris2 -s /sbin/false loris
 a2enmod headers expires
-cp "$HOME_DIR/islandora/install/configs/002-loris.conf" "/etc/apache2/sites-enabled/"
-cp "$HOME_DIR/islandora/install/configs/kdu_libs.conf" "/etc/ld.so.conf.d/kdu_libs.conf"
+cp "$HOME_DIR/islandora/configs/002-loris.conf" "/etc/apache2/sites-enabled/"
+cp "$HOME_DIR/islandora/configs/kdu_libs.conf" "/etc/ld.so.conf.d/kdu_libs.conf"
 ldconfig
 mkdir /usr/local/share/images
 

scripts/post-install.sh

@@ -2,8 +2,8 @@
 echo "RUNNING POST-INSTALL COMMANDS"
 
 HOME_DIR=$1
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 # Chown and chmod tomcat directory

scripts/solr.sh

@@ -4,8 +4,8 @@ echo "Installing Solr"
 
 HOME_DIR=$1
 
-if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then
-  . "$HOME_DIR"/islandora/install/configs/variables
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
 fi
 
 if [ ! -f "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" ]; then