diff --git a/misc/lib/systemd/system/solr.service b/misc/lib/systemd/system/solr.service deleted file mode 100644 index 966ea02..0000000 --- a/misc/lib/systemd/system/solr.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Solr - -[Service] -Type=oneshot -ExecStart=/etc/solr-4.10.2/bin/solr start -p 8983 -ExecStop=/etc/solr-4.10.2/bin/solr stop -p 8983 -RemainAfterExit=yes - diff --git a/vagrant/misc/lib/systemd/system/solr.service b/vagrant/misc/lib/systemd/system/solr.service new file mode 100644 index 0000000..966ea02 --- /dev/null +++ b/vagrant/misc/lib/systemd/system/solr.service @@ -0,0 +1,9 @@ +[Unit] +Description=Solr + +[Service] +Type=oneshot +ExecStart=/etc/solr-4.10.2/bin/solr start -p 8983 +ExecStop=/etc/solr-4.10.2/bin/solr stop -p 8983 +RemainAfterExit=yes + diff --git a/vagrant/provision.sh b/vagrant/provision.sh index 4aee534..c243f0d 100755 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -2,15 +2,6 @@ set -x -### Install solr - -curl http://archive.apache.org/dist/lucene/solr/4.10.2/solr-4.10.2.tgz > solr-4.10.2.tgz -tar xf solr-4.10.2.tgz -mv solr-4.10.2 /etc/solr-4.10.2 -rm -r solr-4.10.2.tgz -cp /etc/solr-4.10.2/example/solr/collection1/conf/lang/stopwords_en.txt /etc/solr-4.10.2/example/solr/collection1/conf/stopwords_en.txt -chown vagrant:vagrant /etc/solr-4.10.2 - ### Configure Colab export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7" @@ -42,3 +33,7 @@ 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 diff --git a/vagrant/ubuntu.sh b/vagrant/ubuntu.sh index cf860e9..4aaab6e 100755 --- a/vagrant/ubuntu.sh +++ b/vagrant/ubuntu.sh @@ -5,7 +5,7 @@ set -ex ### Install dependencies apt-get update -apt-get install curl git unzip mercurial build-essential libev-dev gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev libjpeg-dev zlib1g-dev libfreetype6-dev libpq-dev python-dev postgresql virtualenvwrapper python-pip java -y +apt-get install curl git unzip mercurial build-essential libev-dev gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev libjpeg-dev zlib1g-dev libfreetype6-dev libpq-dev python-dev postgresql virtualenvwrapper python-pip java-common -y ### Create conf directory -- libgit2 0.21.2