Author: rvs
Date: Fri Oct 28 01:23:16 2011
New Revision: 1190118
URL: http://svn.apache.org/viewvc?rev=1190118&view=rev
Log:
BIGTOP-202. zookeeper package is missing zoo.cfg
Added:
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zoo.cfg
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh?rev=1190118&r1=1190117&r2=1190118&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
Fri Oct 28 01:23:16 2011
@@ -118,7 +118,7 @@ cp build/lib/*.jar $PREFIX/$LIB_DIR/lib
# Copy in the configuration files
install -d -m 0755 $PREFIX/$CONF_DIST_DIR
-cp conf/* $PREFIX/$CONF_DIST_DIR/
+cp zoo.cfg conf/* $PREFIX/$CONF_DIST_DIR/
ln -s $CONF_DIR $PREFIX/$LIB_DIR/conf
# Copy in the /usr/bin/zookeeper-server wrapper
Added: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zoo.cfg
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zoo.cfg?rev=1190118&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zoo.cfg (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zoo.cfg Fri Oct
28 01:23:16 2011
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+maxClientCnxns=50
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+dataDir=/var/lib/zookeeper
+# the port at which the clients will connect
+clientPort=2181
+server.0=localhost:2888:3888
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules?rev=1190118&r1=1190117&r2=1190118&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules Fri Oct 28
01:23:16 2011
@@ -46,7 +46,7 @@ install: install-indep
install-indep:
dh_testdir
dh_testroot
- cp debian/zookeeper.1 .
+ cp debian/zookeeper.1 debian/zoo.cfg .
sh -x debian/install_zookeeper.sh \
--build-dir=. \
--prefix=debian/hadoop-zookeeper
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1190118&r1=1190117&r2=1190118&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Fri Oct 28 01:23:16 2011
@@ -71,6 +71,7 @@ Source2: install_zookeeper.sh
Source3: hadoop-zookeeper.sh
Source4: hadoop-zookeeper.sh.suse
Source5: zookeeper.1
+Source6: zoo.cfg
BuildArch: noarch
BuildRequires: ant, autoconf, automake, subversion
Requires(pre): coreutils, shadow-utils, /usr/sbin/groupadd, /usr/sbin/useradd
@@ -126,7 +127,7 @@ bash %{SOURCE1} -Dversion=%{version}
%install
%__rm -rf $RPM_BUILD_ROOT
-cp $RPM_SOURCE_DIR/zookeeper.1 .
+cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg .
sh %{SOURCE2} \
--build-dir=. \
--doc-dir=%{doc_zookeeper} \
