Author: rvs
Date: Tue May 22 21:11:47 2012
New Revision: 1341626
URL: http://svn.apache.org/viewvc?rev=1341626&view=rev
Log:
BIGTOP-595. flume-ng agent should honor /etc/default settings
Added:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.default
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
Added:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.default?rev=1341626&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.default
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.default
Tue May 22 21:11:47 2012
@@ -0,0 +1,3 @@
+# Set a custom agent name (default is agent)
+#
+# FLUME_AGENT_NAME=kings-river-flume
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init?rev=1341626&r1=1341625&r2=1341626&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init Tue
May 22 21:11:47 2012
@@ -33,6 +33,10 @@
. /lib/lsb/init-functions
+if [ -f /etc/default/flume-node ] ; then
+ . /etc/default/flume-node
+fi
+
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
. /usr/libexec/bigtop-detect-javahome
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules?rev=1341626&r1=1341625&r2=1341626&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules Tue May 22
21:11:47 2012
@@ -56,6 +56,8 @@ install-indep:
sh -x debian/install_flume.sh \
--build-dir=${PWD} \
--prefix=debian/flume
+ install -d -m 0755 debian/flume-node/etc/default
+ cp debian/flume-node.default debian/flume-node/etc/default/flume-node
# Remove hadoop dependency and instead symlink in the hadoop jar
rm debian/flume/usr/lib/flume/lib/hadoop-*
ln -s /usr/lib/hadoop/hadoop-common.jar
debian/flume/usr/lib/flume/lib/hadoop-common.jar
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1341626&r1=1341625&r2=1341626&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Tue
May 22 21:11:47 2012
@@ -63,6 +63,7 @@ Source0: apache-%{name}-%{flume_base_ver
Source1: do-component-build
Source2: install_%{name}.sh
Source3: %{name}-node.init
+Source4: flume-node.default
Requires: /usr/sbin/useradd
Requires: coreutils
Requires: hadoop-hdfs
@@ -130,6 +131,9 @@ chmod 755 $init_file
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
+%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
+%__cp %{SOURCE4} $RPM_BUILD_ROOT/etc/default/%{name}-node
+
# Get rid of hadoop jar, and instead link to installed hadoop
rm $RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-*
ln -s /usr/lib/hadoop/hadoop-common.jar
$RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-common.jar
@@ -181,3 +185,4 @@ fi
%files node
%attr(0755,root,root)/%{initd_dir}/%{name}-node
+%attr(0644,root,root) %config(noreplace) /etc/default/%{name}-node
