From 19d73b430ba5664fd32f98e2ceb03c65cf60fa2c Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Fri, 7 Oct 2016 12:44:37 -0300 Subject: [PATCH 1/6] Adapting install for pruned alpaca --- Alpaca | 2 +- install/configs/karaf/islandora_sync_gateway.script | 2 -- install/configs/karaf/watch.script | 1 - install/scripts/islandora-karaf-components.sh | 3 --- 4 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 install/configs/karaf/islandora_sync_gateway.script diff --git a/Alpaca b/Alpaca index 958e14b6b..e16d33799 160000 --- a/Alpaca +++ b/Alpaca @@ -1 +1 @@ -Subproject commit 958e14b6b28f912b7cab303c3d88aac6cb7cdca7 +Subproject commit e16d337995b457f6128b17938341895b33c4570b diff --git a/install/configs/karaf/islandora_sync_gateway.script b/install/configs/karaf/islandora_sync_gateway.script deleted file mode 100644 index 4ea0f711c..000000000 --- a/install/configs/karaf/islandora_sync_gateway.script +++ /dev/null @@ -1,2 +0,0 @@ -repo-add file:/home/vagrant/Alpaca/karaf/build/resources/main/features.xml -feature:install islandora-sync-gateway diff --git a/install/configs/karaf/watch.script b/install/configs/karaf/watch.script index 466e82e2d..1b6100661 100644 --- a/install/configs/karaf/watch.script +++ b/install/configs/karaf/watch.script @@ -1,2 +1 @@ -bundle:watch --start mvn:ca.islandora.indexing/islandora-indexing-triplestore/0.1.0-SNAPSHOT logout diff --git a/install/scripts/islandora-karaf-components.sh b/install/scripts/islandora-karaf-components.sh index 399ac5055..8d0c844bc 100755 --- a/install/scripts/islandora-karaf-components.sh +++ b/install/scripts/islandora-karaf-components.sh @@ -7,9 +7,6 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then . "$HOME_DIR"/islandora/install/configs/variables 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" $KARAF_CLIENT -f $KARAF_CONFIGS/islandora_indexing_triplestore.script From 61c26f4504513fab85d87d1fd658bd43ad125364 Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Wed, 12 Oct 2016 14:44:08 -0300 Subject: [PATCH 2/6] Fixing build for alpaca pruning --- install/Vagrantfile | 28 ++++++++++--------- .../islandora_indexing_triplestore.script | 2 +- install/configs/karaf/watch.script | 1 + install/scripts/alpaca.sh | 11 ++++---- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/install/Vagrantfile b/install/Vagrantfile index 283425c42..b7bf77626 100644 --- a/install/Vagrantfile +++ b/install/Vagrantfile @@ -54,19 +54,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--description", $virtualBoxDescription] end - config.vm.provision :shell, inline: "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile", :privileged =>false - config.vm.provision :shell, :path => "./scripts/bootstrap.sh", :args => home_dir - config.vm.provision :shell, :path => "./scripts/lamp-server.sh", :args => home_dir - 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/loris.sh", :args => home_dir - config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir - config.vm.provision :shell, :path => "./scripts/drupal-console.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 - config.vm.provision :shell, :path => "./scripts/karaf.sh", :args => home_dir - config.vm.provision :shell, :path => "./scripts/fcrepo-camel-toolbox.sh", :args => home_dir +# config.vm.provision :shell, inline: "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile", :privileged =>false +# config.vm.provision :shell, :path => "./scripts/bootstrap.sh", :args => home_dir +# config.vm.provision :shell, :path => "./scripts/lamp-server.sh", :args => home_dir +# 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/loris.sh", :args => home_dir +# config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir +# config.vm.provision :shell, :path => "./scripts/drupal-console.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 +# config.vm.provision :shell, :path => "./scripts/karaf.sh", :args => home_dir +# config.vm.provision :shell, :path => "./scripts/fcrepo-camel-toolbox.sh", :args => home_dir +# config.vm.provision :shell, :path => "./scripts/alpaca.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/islandora-karaf-components.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/config.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/post-install.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/islandora-microservices.sh", :args => home_dir diff --git a/install/configs/karaf/islandora_indexing_triplestore.script b/install/configs/karaf/islandora_indexing_triplestore.script index 20f5c6579..67569d4c0 100644 --- a/install/configs/karaf/islandora_indexing_triplestore.script +++ b/install/configs/karaf/islandora_indexing_triplestore.script @@ -1,2 +1,2 @@ -repo-add file:/home/vagrant/Alpaca/karaf/build/resources/main/features.xml +repo-add file:/home/vagrant/islandora/Alpaca/karaf/build/resources/main/features.xml feature:install islandora-indexing-triplestore diff --git a/install/configs/karaf/watch.script b/install/configs/karaf/watch.script index 1b6100661..466e82e2d 100644 --- a/install/configs/karaf/watch.script +++ b/install/configs/karaf/watch.script @@ -1 +1,2 @@ +bundle:watch --start mvn:ca.islandora.indexing/islandora-indexing-triplestore/0.1.0-SNAPSHOT logout diff --git a/install/scripts/alpaca.sh b/install/scripts/alpaca.sh index 039bc6823..04d61292d 100644 --- a/install/scripts/alpaca.sh +++ b/install/scripts/alpaca.sh @@ -8,11 +8,12 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then . "$HOME_DIR"/islandora/install/configs/variables fi -cd "$HOME_DIR" -git clone https://github.com/Islandora-CLAW/Alpaca.git -cd Alpaca -chown -R vagrant:vagrant "$HOME_DIR/Alpaca" +cd "$HOME_DIR"/islandora/Alpaca +#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 everything over to the vagrant user just in case -chown -R vagrant:vagrant "$HOME_DIR/Alpaca" +#chown -R vagrant:vagrant "$HOME_DIR/Alpaca" From a82b6bfe930206116b4175c69e17f80333e9f49e Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Wed, 12 Oct 2016 14:57:43 -0300 Subject: [PATCH 3/6] Getting rid of commented out provision statements from testing. --- install/Vagrantfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/install/Vagrantfile b/install/Vagrantfile index b7bf77626..a21f6220e 100644 --- a/install/Vagrantfile +++ b/install/Vagrantfile @@ -54,20 +54,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--description", $virtualBoxDescription] end -# config.vm.provision :shell, inline: "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile", :privileged =>false -# config.vm.provision :shell, :path => "./scripts/bootstrap.sh", :args => home_dir -# config.vm.provision :shell, :path => "./scripts/lamp-server.sh", :args => home_dir -# 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/loris.sh", :args => home_dir -# config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir -# config.vm.provision :shell, :path => "./scripts/drupal-console.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 -# config.vm.provision :shell, :path => "./scripts/karaf.sh", :args => home_dir -# config.vm.provision :shell, :path => "./scripts/fcrepo-camel-toolbox.sh", :args => home_dir -# config.vm.provision :shell, :path => "./scripts/alpaca.sh", :args => home_dir + config.vm.provision :shell, inline: "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile", :privileged =>false + config.vm.provision :shell, :path => "./scripts/bootstrap.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/lamp-server.sh", :args => home_dir + 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/loris.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/drupal-console.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 + config.vm.provision :shell, :path => "./scripts/karaf.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/fcrepo-camel-toolbox.sh", :args => home_dir + config.vm.provision :shell, :path => "./scripts/alpaca.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/islandora-karaf-components.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/config.sh", :args => home_dir config.vm.provision :shell, :path => "./scripts/post-install.sh", :args => home_dir From c5fb226aea907a8f3aaf276cdba0e9ac2dd81214 Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Wed, 12 Oct 2016 14:59:51 -0300 Subject: [PATCH 4/6] Making the alpaca install point to the already cloned CLAW repo. --- install/scripts/alpaca.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/install/scripts/alpaca.sh b/install/scripts/alpaca.sh index 04d61292d..0215fbb55 100644 --- a/install/scripts/alpaca.sh +++ b/install/scripts/alpaca.sh @@ -9,11 +9,4 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then fi cd "$HOME_DIR"/islandora/Alpaca -#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 everything over to the vagrant user just in case -#chown -R vagrant:vagrant "$HOME_DIR/Alpaca" From 8d705adf1f131f1e6670b76de9408b4903d6da3d Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Fri, 21 Oct 2016 11:36:34 -0300 Subject: [PATCH 5/6] Putting it back to point to head.... --- install/scripts/alpaca.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/install/scripts/alpaca.sh b/install/scripts/alpaca.sh index 0215fbb55..039bc6823 100644 --- a/install/scripts/alpaca.sh +++ b/install/scripts/alpaca.sh @@ -8,5 +8,11 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then . "$HOME_DIR"/islandora/install/configs/variables fi -cd "$HOME_DIR"/islandora/Alpaca +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 everything over to the vagrant user just in case +chown -R vagrant:vagrant "$HOME_DIR/Alpaca" From 7a90f2d299e810ea4055ef23fd19a386ddbd65f3 Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Fri, 21 Oct 2016 11:40:14 -0300 Subject: [PATCH 6/6] Pointing to correct features file now --- install/configs/karaf/islandora_indexing_triplestore.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/configs/karaf/islandora_indexing_triplestore.script b/install/configs/karaf/islandora_indexing_triplestore.script index 67569d4c0..20f5c6579 100644 --- a/install/configs/karaf/islandora_indexing_triplestore.script +++ b/install/configs/karaf/islandora_indexing_triplestore.script @@ -1,2 +1,2 @@ -repo-add file:/home/vagrant/islandora/Alpaca/karaf/build/resources/main/features.xml +repo-add file:/home/vagrant/Alpaca/karaf/build/resources/main/features.xml feature:install islandora-indexing-triplestore