コミット: a96b42f3220ab4111d0a19c73546bbf1fc4cc21e - allura (git)

allura

コミットメタ情報

• リビジョン: a96b42f3220ab4111d0a19c73546bbf1fc4cc21e (tree)
• 日時: 2012-07-19 03:58:58
• 作者: Dave Brondsema <dbrondsema@geek...>
• コミッター: Jenny Steele

ログメッセージ

[#4539] move solr installation into the box setup

変更サマリ

• modified: vagrant/allura_setup.sh
• modified: vagrant/start_allura

差分

--- a/vagrant/allura_setup.sh
+++ b/vagrant/allura_setup.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+# Install Solr
+cd /home/vagrant/src
+if [ ! -d apache-solr-1.4.1 ]
+then
+    echo "Installing Solr..."
+    wget -q http://apache.mirrors.tds.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz
+    tar xf apache-solr-1.4.1.tgz && rm -f apache-solr-1.4.1.tgz
+    cd apache-solr-1.4.1/example/
+    mkdir -p /home/vagrant/src/forge/solr_config/conf
+    cp solr/conf/solrconfig.xml /home/vagrant/src/forge/solr_config/conf/
+    chown -R vagrant:vagrant /home/vagrant/src/apache-solr* /home/vagrant/src/forge/solr_config/conf/
+fi
+
 # Create log dir
 if [ ! -d /var/log/allura ]
 then

--- a/vagrant/start_allura
+++ b/vagrant/start_allura
@@ -12,18 +12,6 @@ then
 fi
 echo "Logs are in /var/log/allura"
 
-# Install Solr
-cd /home/vagrant/src
-if [ ! -d apache-solr-1.4.1 ]
-then
-    echo "Installing Solr..."
-    wget -q http://apache.mirrors.tds.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz
-    tar xf apache-solr-1.4.1.tgz && rm -f apache-solr-1.4.1.tgz
-    cd apache-solr-1.4.1/example/
-    mkdir -p /home/vagrant/src/forge/solr_config/conf
-    cp solr/conf/solrconfig.xml /home/vagrant/src/forge/solr_config/conf/
-fi
-
 # Start solr
 if pgrep -f solr.*start.jar >/dev/null
 then