BIGTOP-1829. Tachyon configuration files should reside in /etc/tachyon/conf instead of /etc/tachyon
Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8239a3af Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8239a3af Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8239a3af Branch: refs/heads/master Commit: 8239a3af0873fdd4e10426f499a7002029e55b25 Parents: 61a3f67 Author: Evans Ye <[email protected]> Authored: Mon Apr 13 16:14:21 2015 +0000 Committer: Konstantin Boudnik <[email protected]> Committed: Fri May 1 16:14:23 2015 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/tachyon/manifests/init.pp | 4 ++-- bigtop-packages/src/common/tachyon/install_tachyon.sh | 7 ++++--- bigtop-packages/src/deb/tachyon/tachyon.dirs | 2 +- bigtop-packages/src/deb/tachyon/tachyon.install | 2 +- bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8239a3af/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp index 557b05e..2e525fe 100644 --- a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp @@ -17,13 +17,13 @@ class tachyon { # add logging into /var/log/.. file { - "/etc/tachyon/log4j.properties": + "/etc/tachyon/conf/log4j.properties": content => template("tachyon/log4j.properties"), require => [Package["tachyon"]] } # add tachyon-env.sh to point to tachyon master - file { "/etc/tachyon/tachyon-env.sh": + file { "/etc/tachyon/conf/tachyon-env.sh": content => template("tachyon/tachyon-env.sh"), require => [Package["tachyon"]] } http://git-wip-us.apache.org/repos/asf/bigtop/blob/8239a3af/bigtop-packages/src/common/tachyon/install_tachyon.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/tachyon/install_tachyon.sh b/bigtop-packages/src/common/tachyon/install_tachyon.sh index ef0e102..e9efe37 100644 --- a/bigtop-packages/src/common/tachyon/install_tachyon.sh +++ b/bigtop-packages/src/common/tachyon/install_tachyon.sh @@ -102,6 +102,7 @@ install -d -m 0755 $PREFIX/$DATA_DIR install -d -m 0755 $PREFIX/$DATA_DIR/tachyon install -d -m 0755 $PREFIX/etc install -d -m 0755 $PREFIX/etc/tachyon +install -d -m 0755 $PREFIX/etc/tachyon/conf install -d -m 0755 $PREFIX/$VAR_DIR/log/tachyon install -d -m 0755 $PREFIX/$VAR_DIR/lib/tachyon/journal install -d -m 0755 $PREFIX/$VAR_DIR/lib/tachyon/core/src/main/webapp @@ -115,8 +116,8 @@ cp -a libexec/* $PREFIX/${LIB_DIR}/libexec cp -rf core/src/main/webapp $PREFIX/$VAR_DIR/lib/tachyon/core/src/main # Copy in the configuration files -install -m 0644 conf/log4j.properties conf/workers $PREFIX/etc/tachyon -cp conf/tachyon-env.sh.template $PREFIX/etc/tachyon/tachyon-env.sh +install -m 0644 conf/log4j.properties conf/workers $PREFIX/etc/tachyon/conf +cp conf/tachyon-env.sh.template $PREFIX/etc/tachyon/conf/tachyon-env.sh # Copy in the /usr/bin/tachyon wrapper install -d -m 0755 $PREFIX/$BIN_DIR @@ -143,7 +144,7 @@ cat >$PREFIX/$LIB_DIR/libexec/tachyon-layout.sh <<EOF export TACHYON_SYSTEM_INSTALLATION="TRUE" export TACHYON_PREFIX="$LIB_DIR" export TACHYON_HOME="/var/lib/tachyon" -export TACHYON_CONF_DIR="/etc/tachyon" +export TACHYON_CONF_DIR="/etc/tachyon/conf" export TACHYON_LOGS_DIR="/var/log/tachyon" export TACHYON_DATA_DIR="/var/run/tachyon" export TACHYON_JAR="\`find $LIB_DIR/ -name tachyon*dependencies.jar|grep -v client\`" http://git-wip-us.apache.org/repos/asf/bigtop/blob/8239a3af/bigtop-packages/src/deb/tachyon/tachyon.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.dirs b/bigtop-packages/src/deb/tachyon/tachyon.dirs index 1216d18..fc644d3 100644 --- a/bigtop-packages/src/deb/tachyon/tachyon.dirs +++ b/bigtop-packages/src/deb/tachyon/tachyon.dirs @@ -1,3 +1,3 @@ -/etc/tachyon/ +/etc/tachyon/conf /usr/lib/tachyon /usr/bin http://git-wip-us.apache.org/repos/asf/bigtop/blob/8239a3af/bigtop-packages/src/deb/tachyon/tachyon.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.install b/bigtop-packages/src/deb/tachyon/tachyon.install index 9ee1e55..473e2f5 100644 --- a/bigtop-packages/src/deb/tachyon/tachyon.install +++ b/bigtop-packages/src/deb/tachyon/tachyon.install @@ -1,3 +1,3 @@ -/etc/tachyon/ +/etc/tachyon/conf /usr/lib/tachyon /usr/bin/tachyon http://git-wip-us.apache.org/repos/asf/bigtop/blob/8239a3af/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec b/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec index 3b9bc8b..5878f93 100644 --- a/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec +++ b/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec @@ -105,11 +105,11 @@ done %defattr(-,root,root,-) %doc LICENSE README.md %dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/log4j.properties -%config(noreplace) %{_sysconfdir}/%{name}/workers +%config(noreplace) %{_sysconfdir}/%{name}/conf/log4j.properties +%config(noreplace) %{_sysconfdir}/%{name}/conf/workers %config(noreplace) %{initd_dir}/%{name}-master %config(noreplace) %{initd_dir}/%{name}-worker -%config(noreplace) %{_sysconfdir}/%{name}/tachyon-env.sh +%config(noreplace) %{_sysconfdir}/%{name}/conf/tachyon-env.sh %config(noreplace) %{tachyon_home}/libexec/tachyon-layout.sh %attr(0755,root,root) %{var_lib} %attr(0755,root,root) %{var_run}
