You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ma...@apache.org on 2014/04/30 21:04:15 UTC
git commit: BIGTOP-1266. Zookeeper init script doesn't source
/etc/default/zookeeper
Repository: bigtop
Updated Branches:
refs/heads/master 93bd66dae -> 6e936162a
BIGTOP-1266. Zookeeper init script doesn't source /etc/default/zookeeper
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6e936162
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6e936162
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6e936162
Branch: refs/heads/master
Commit: 6e936162ac33687003aad1e6c2d515d30974b673
Parents: 93bd66d
Author: Sean Mackrory <ma...@apache.org>
Authored: Thu Apr 10 07:41:51 2014 -0600
Committer: Sean Mackrory <ma...@apache.org>
Committed: Wed Apr 30 10:10:42 2014 -0600
----------------------------------------------------------------------
.../src/common/zookeeper/install_zookeeper.sh | 3 +++
.../src/common/zookeeper/zookeeper-server.sh | 2 ++
.../src/common/zookeeper/zookeeper-server.sh.suse | 2 ++
.../src/common/zookeeper/zookeeper.default | 17 +++++++++++++++++
bigtop-packages/src/deb/zookeeper/rules | 4 ++--
.../src/deb/zookeeper/zookeeper-server.init | 5 +++++
.../src/rpm/zookeeper/SPECS/zookeeper.spec | 7 ++++---
7 files changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
index 35fb502..0ad7712 100755
--- a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
+++ b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
@@ -167,6 +167,9 @@ install -d -m 0755 $PREFIX/$DOC_DIR
cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR
cp $BUILD_DIR/*.txt $PREFIX/$DOC_DIR/
+install -d -m 0755 ${PREFIX}/etc/default
+cp zookeeper.default ${PREFIX}/etc/default/zookeeper
+
install -d -m 0755 $PREFIX/$MAN_DIR
gzip -c zookeeper.1 > $PREFIX/$MAN_DIR/zookeeper.1.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
index 865ea8d..eff68d8 100755
--- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
+++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
@@ -34,6 +34,8 @@ set -e
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
+. /etc/default/zookeeper
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT="/usr/bin/zookeeper-server"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
index 2ac6193..adb27d0 100644
--- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
+++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
@@ -36,6 +36,8 @@
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
+. /etc/default/zookeeper
+
STATUS_RUNNING=0
STATUS_DEAD=1
STATUS_DEAD_AND_LOCK=2
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/common/zookeeper/zookeeper.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/zookeeper.default b/bigtop-packages/src/common/zookeeper/zookeeper.default
new file mode 100644
index 0000000..03eebf4
--- /dev/null
+++ b/bigtop-packages/src/common/zookeeper/zookeeper.default
@@ -0,0 +1,17 @@
+# 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.
+
+# Command-line parameters to pass to the JVM
+# export SERVER_JVMFLAGS=""
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/deb/zookeeper/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/zookeeper/rules b/bigtop-packages/src/deb/zookeeper/rules
index 5840611..70ec4c4 100755
--- a/bigtop-packages/src/deb/zookeeper/rules
+++ b/bigtop-packages/src/deb/zookeeper/rules
@@ -34,8 +34,8 @@ override_dh_auto_build:
tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
override_dh_auto_install:
- cp debian/zookeeper.1 debian/zoo.cfg .
- sh -x debian/install_zookeeper.sh \
+ cp debian/zookeeper.1 debian/zoo.cfg debian/zookeeper.default .
+ bash -x debian/install_zookeeper.sh \
--build-dir=build/zookeeper-${ZOOKEEPER_BASE_VERSION} \
--prefix=debian/$(zookeeper_pkg_name)
dh_install -i
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
index 3c2e120..6e12812 100644
--- a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
+++ b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
@@ -31,6 +31,11 @@
### END INIT INFO
set -e
+# Autodetect JAVA_HOME if not defined
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
+
+. /etc/default/zookeeper
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT="/usr/bin/zookeeper-server"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6e936162/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
index 320450b..4b3f6fe 100644
--- a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
+++ b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
@@ -74,6 +74,7 @@ Source3: zookeeper-server.sh
Source4: zookeeper-server.sh.suse
Source5: zookeeper.1
Source6: zoo.cfg
+Source7: zookeeper.default
BuildArch: noarch
BuildRequires: autoconf, automake
Requires(pre): coreutils, /usr/sbin/groupadd, /usr/sbin/useradd
@@ -129,13 +130,12 @@ bash %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
-cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg .
-sh %{SOURCE2} \
+cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg $RPM_SOURCE_DIR/zookeeper.default .
+bash %{SOURCE2} \
--build-dir=build/%{name}-%{zookeeper_base_version} \
--doc-dir=%{doc_zookeeper} \
--prefix=$RPM_BUILD_ROOT
-
%if %{?suse_version:1}0
orig_init_file=%{SOURCE4}
%else
@@ -188,6 +188,7 @@ fi
%files
%defattr(-,root,root)
%config(noreplace) %{etc_zookeeper}/conf.dist
+%config(noreplace) /etc/default/zookeeper
%{lib_zookeeper}
%{bin_zookeeper}/zookeeper-server
%{bin_zookeeper}/zookeeper-server-initialize