Commit 0435436cd21d597bbe58572b0ee21a1c144d5f70
Committed by
Thiago Ribeiro
1 parent
7dc51664
Exists in
trac_indexing
Install Solr using local script
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
ci/install_solr.sh
@@ -183,11 +183,7 @@ download_and_run() { | @@ -183,11 +183,7 @@ download_and_run() { | ||
183 | # copies custom configurations | 183 | # copies custom configurations |
184 | for file in $SOLR_CONFS | 184 | for file in $SOLR_CONFS |
185 | do | 185 | do |
186 | - if [ -d $file ] | ||
187 | - then | ||
188 | - cp $file/* $dir_name/example/solr/$dir_conf | ||
189 | - echo "Copied directory $file into solr conf directory." | ||
190 | - elif [ -f $file ] | 186 | + if [ -f $file ] |
191 | then | 187 | then |
192 | cp $file $dir_name/example/solr/$dir_conf | 188 | cp $file $dir_name/example/solr/$dir_conf |
193 | echo "Copied $file into solr conf directory." | 189 | echo "Copied $file into solr conf directory." |
vagrant/provision.sh
@@ -34,6 +34,11 @@ fi | @@ -34,6 +34,11 @@ fi | ||
34 | colab-admin migrate | 34 | colab-admin migrate |
35 | colab-admin loaddata /vagrant/tests/test_data.json | 35 | colab-admin loaddata /vagrant/tests/test_data.json |
36 | 36 | ||
37 | + | ||
37 | ### Install solr | 38 | ### Install solr |
39 | + | ||
38 | colab-admin build_solr_schema -f /tmp/schema.xml | 40 | colab-admin build_solr_schema -f /tmp/schema.xml |
39 | -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 | 41 | + |
42 | +SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml" exec $basedir/ci/install_solr.sh | ||
43 | + | ||
44 | +colab-admin rebuild_index --noinput |