Updating for new Fedora/Solr wrappers

README.md

@@ -25,9 +25,9 @@ You can shell into the machine with `vagrant ssh` or `ssh -p 2222 vagrant@localh
 
 * Ubuntu 14.04 64-bit base machine
 * A stock [Curation Concerns](https://github.com/projecthydra-labs/curation_concerns) app: [http://localhost:3000](http://localhost:3000)
-* [Tomcat 7](http://tomcat.apache.org):  [http://localhost:8080](http://localhost:8080) (manager username = "fedora4", password = "fedora4")
-* [Fedora 4.x](http://fedora.info/about): [http://localhost:8080/fcrepo](http://localhost:8080/fcrepo)
-* [Solr 4.10.3](http://lucene.apache.org/solr/): [http://localhost:8080/solr](http://localhost:8080/solr)
+  * Not running by default, start with `cd curation-concerns-demo; rails s -b 0.0.0.0`
+* [Solr 5.4.1](http://lucene.apache.org/solr/): [http://localhost:8983/solr/](http://localhost:8983/solr/)
+* [Fedora 4.5.0](http://fedorarepository.org/): [http://localhost:8984/](http://localhost:8984/)
 
 ## Thanks
 

Vagrantfile

@@ -11,7 +11,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 	config.vm.box = "ubuntu/trusty64"
 
 	config.vm.network :forwarded_port, guest: 3000, host: 3000 # Rails
-	config.vm.network :forwarded_port, guest: 8983, host: 8983 # Jetty
+	config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr 5.4
+	config.vm.network :forwarded_port, guest: 8984, host: 8984 # Fedora 4.5
 
   config.vm.provider "virtualbox" do |v|
   	v.memory = 2048
@@ -23,6 +24,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "./install_scripts/java.sh", args: shared_dir
   config.vm.provision "shell", path: "./install_scripts/ruby.sh", args: shared_dir
   config.vm.provision "shell", path: "./install_scripts/fits.sh", args: shared_dir
-  config.vm.provision "shell", path: "./install_scripts/curation-concerns.sh", args: shared_dir
+  config.vm.provision "shell", path: "./install_scripts/curation-concerns.sh", args: shared_dir, privileged: false
 
 end

install_scripts/curation-concerns.sh

@@ -11,13 +11,19 @@ yes Y | rails generate curation_concerns:install
 rake db:migrate
 rails generate curation_concerns:work Book
 
-# setup hydra-jetty
-bundle exec rake jetty:clean
-bundle exec rake jetty:config
-bundle exec rake jetty:start
-
 # start redis
 sudo /etc/init.d/redis-server start
 
-# run the webserver
-unicorn -D -p 3000
+# start rails, fedora and solr for development
+nohup fcrepo_wrapper -p 8984 > log/fedora.log 2>&1 &
+nohup solr_wrapper --version 5.4.1 -d solr/config/ -p 8983 -n hydra-development > log/solr.log 2>&1 &
+
+printf 'waiting for solr and fedora'
+until $(curl --output /dev/null --silent --head --fail http://localhost:8983/solr); do
+    printf '.'
+    sleep 1
+done
+until $(curl --output /dev/null --silent --head --fail http://localhost:8984/rest); do
+    printf '.'
+    sleep 1
+done

install_scripts/fits.sh

@@ -11,5 +11,6 @@ cd $DOWNLOAD_DIR
 sudo curl $DOWNLOAD_URL > fits.zip
 unzip fits.zip
 chmod a+x fits-$FITS_VERSION/*.sh
-sudo cp -r fits-$FITS_VERSION/* /usr/local/bin
-sudo ln -s /usr/local/bin/fits.sh /usr/local/bin/fits
+sudo mv fits-$FITS_VERSION /usr/local
+sudo ln -s /usr/local/fits-$FITS_VERSION/fits.sh /usr/local/bin/fits.sh
+sudo ln -s /usr/local/fits-$FITS_VERSION/fits-env.sh /usr/local/bin/fits-env.sh