diff --git a/ci/install_solr.sh b/ci/install_solr.sh index 9dfaddc..62f496c 100755 --- a/ci/install_solr.sh +++ b/ci/install_solr.sh @@ -183,11 +183,7 @@ download_and_run() { # copies custom configurations for file in $SOLR_CONFS do - if [ -d $file ] - then - cp $file/* $dir_name/example/solr/$dir_conf - echo "Copied directory $file into solr conf directory." - elif [ -f $file ] + if [ -f $file ] then cp $file $dir_name/example/solr/$dir_conf echo "Copied $file into solr conf directory." diff --git a/vagrant/provision.sh b/vagrant/provision.sh index c243f0d..2cda3ac 100755 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -34,6 +34,11 @@ fi colab-admin migrate colab-admin loaddata /vagrant/tests/test_data.json + ### Install solr + colab-admin build_solr_schema -f /tmp/schema.xml -curl -sSL https://raw.githubusercontent.com/moliware/travis-solr/master/travis-solr.sh | SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml /vagrant/vagrant/solr-config/stopwords.txt" bash + +SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml" exec $basedir/ci/install_solr.sh + +colab-admin rebuild_index --noinput -- libgit2 0.21.2