You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 07:04:01 UTC
[16/50] [abbrv] git commit: BIGTOP-778. move Solr app to under /solr
in Tomcat deployment and provide more knobs
BIGTOP-778. move Solr app to under /solr in Tomcat deployment and provide more knobs
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9d15f3d8
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9d15f3d8
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9d15f3d8
Branch: refs/heads/RCs
Commit: 9d15f3d8f8deefa247f90117e48f99611474323a
Parents: e39e9f6
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Mon Dec 3 15:11:27 2012 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Mon Dec 3 15:11:27 2012 -0800
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/solr/templates/solr | 5 ++---
.../puppet/modules/solr/templates/solr.xml | 2 +-
bigtop-packages/src/common/solr/install_solr.sh | 7 ++++++-
bigtop-packages/src/common/solr/solr.default | 3 +--
4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9d15f3d8/bigtop-deploy/puppet/modules/solr/templates/solr
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/solr/templates/solr b/bigtop-deploy/puppet/modules/solr/templates/solr
index cb4a339..ffab877 100644
--- a/bigtop-deploy/puppet/modules/solr/templates/solr
+++ b/bigtop-deploy/puppet/modules/solr/templates/solr
@@ -14,8 +14,7 @@
# limitations under the License.
SOLR_PORT="<%= port %>"
SOLR_ADMIN_PORT="<%= port_admin %>"
-SOLR_ZK_ENSEMBLE="<%= zk %>"
+SOLR_ZK_ENSEMBLE="<%= zk %>/solr"
SOLR_LOG=/var/log/solr
SOLR_DATA_DIR=/var/lib/solr/index
-# SOLR_ZK_ROOT=
-# CATALINA_OPTS="-DzkHost=$SOLR_ZK_ENSEMBLE"
+# CATALINA_OPTS="-Dfoo=bar"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9d15f3d8/bigtop-deploy/puppet/modules/solr/templates/solr.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/solr/templates/solr.xml b/bigtop-deploy/puppet/modules/solr/templates/solr.xml
index 4c191ec..66309f3 100644
--- a/bigtop-deploy/puppet/modules/solr/templates/solr.xml
+++ b/bigtop-deploy/puppet/modules/solr/templates/solr.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<solr persistent="false">
- <cores adminPath="/admin/cores" host="<%= fqdn %>" hostPort="<%= port %>" hostContext=".">
+ <cores adminPath="/admin/cores" host="<%= fqdn %>" hostPort="<%= port %>" hostContext="${hostContext:}" zkClientTimeout="${zkClientTimeout:15000}">
<% collections.each do |collection| %>
<core name="<%= collection %>_<%= fqdn.to_s.tr('.', '_') %>" shard="<%= collection %>_<%= fqdn.to_s.tr('.', '_') %>" collection="<%= collection %>"
instanceDir="<%= fqdn.to_s.tr('.', '_') %>/" schema="schema.xml" config="solrconfig.xml"/>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9d15f3d8/bigtop-packages/src/common/solr/install_solr.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh
index a51e852..45f9c3e 100644
--- a/bigtop-packages/src/common/solr/install_solr.sh
+++ b/bigtop-packages/src/common/solr/install_solr.sh
@@ -115,8 +115,13 @@ cp -ra ${BUILD_DIR}/dist/solrj-lib $PREFIX/$LIB_DIR/lib
install -d -m 0755 $PREFIX/$LIB_DIR/contrib
cp -ra ${BUILD_DIR}/contrib/velocity $PREFIX/$LIB_DIR/contrib
+install -d -m 0755 $PREFIX/$LIB_DIR/server/webapps/solr
+(cd $PREFIX/$LIB_DIR/server/webapps/solr ; jar xf ../../../*.war)
+
install -d -m 0755 $PREFIX/$LIB_DIR/server/webapps/ROOT
-(cd $PREFIX/$LIB_DIR/server/webapps/ROOT ; jar xf ../../../*.war)
+cat > $PREFIX/$LIB_DIR/server/webapps/ROOT/index.html <<__EOT__
+<html><head><meta http-equiv="refresh" content="0;url=./solr"></head><body><a href="/solr">Solr Console</a></body></html>
+__EOT__
install -d -m 0755 $PREFIX/$LIB_DIR/server/conf
cp $DISTRO_DIR/web.xml $PREFIX/$LIB_DIR/server/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9d15f3d8/bigtop-packages/src/common/solr/solr.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/solr/solr.default b/bigtop-packages/src/common/solr/solr.default
index c263281..6581844 100644
--- a/bigtop-packages/src/common/solr/solr.default
+++ b/bigtop-packages/src/common/solr/solr.default
@@ -16,5 +16,4 @@ SOLR_PORT=1978
SOLR_ADMIN_PORT=1979
SOLR_LOG=/var/log/solr
SOLR_DATA_DIR=/var/lib/solr/index
-# SOLR_ZK_ENSEMBLE=
-# SOLR_ZK_ROOT=
+# SOLR_ZK_ENSEMBLE=localhost:2181/solr