Repository: mesos Updated Branches: refs/heads/master a82eff2f9 -> fd798ffbe
Update deploy_dir from localstate to sysconf Updates the mesos-env files to install to /etc/mesos vs. /var/lib/deploy/mesos. Review: https://reviews.apache.org/r/25447 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fd798ffb Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fd798ffb Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fd798ffb Branch: refs/heads/master Commit: fd798ffbeecee644b4674a9149c38d563bfa044e Parents: a82eff2 Author: Timothy St. Clair <[email protected]> Authored: Tue Sep 9 13:28:10 2014 -0500 Committer: Timothy St. Clair <[email protected]> Committed: Tue Sep 9 13:28:10 2014 -0500 ---------------------------------------------------------------------- src/Makefile.am | 14 +++++++------- src/deploy/mesos-daemon.sh.in | 2 +- src/deploy/mesos-start-cluster.sh.in | 2 +- src/deploy/mesos-start-masters.sh.in | 2 +- src/deploy/mesos-start-slaves.sh.in | 2 +- src/deploy/mesos-stop-masters.sh.in | 2 +- src/deploy/mesos-stop-slaves.sh.in | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 37b4370..9b973e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,11 +39,11 @@ PROTOBUF = $(LIBPROCESS)/3rdparty/protobuf-$(PROTOBUF_VERSION) PICOJSON = $(LIBPROCESS)/3rdparty/picojson-$(PICOJSON_VERSION) -# Unfortunatley, 'pkglibexecdir' and 'pkglocalstatedir' are not set +# Unfortunatley, 'pkglibexecdir' and 'pkgsysconfdir' are not set # before automake 1.11, so we need to set them manually (until we in # the future assume an automake version). pkglibexecdir = $(libexecdir)/$(PACKAGE) -pkglocalstatedir = $(localstatedir)/$(PACKAGE) +pkgsysconfdir = $(sysconfdir)/$(PACKAGE) if WITH_BUNDLED_PROTOBUF # Protocol buffer compiler. @@ -64,7 +64,7 @@ dist_bin_SCRIPTS = dist_pkglibexec_SCRIPTS = nobase_dist_pkgdata_DATA = nodist_sbin_SCRIPTS = -nobase_pkglocalstate_DATA = +pkgsysconf_DATA = check_PROGRAMS = dist_check_SCRIPTS = check_SCRIPTS = @@ -695,7 +695,7 @@ dist_mesospythonpkglibexec_SCRIPTS = \ # package name (i.e., 'mesos') as part of the path (i.e., # /path/to/mesos/webui versus something like /path/to/webui). Note # that 'datadir' (e.g., /usr/local/share) is for read-only "data" and -# 'localstatedir' (e.g., /usr/local/var) is for modifiable "data". +# 'sysconfdir' (e.g., /usr/local/var) is for modifiable "data". nobase_dist_pkgdata_DATA += \ webui/master/static/js/controllers.js \ webui/master/static/js/app.js \ @@ -760,9 +760,9 @@ nodist_sbin_SCRIPTS += deploy/mesos-daemon.sh \ deploy/mesos-start-slaves.sh deploy/mesos-stop-cluster.sh \ deploy/mesos-stop-masters.sh deploy/mesos-stop-slaves.sh -nobase_pkglocalstate_DATA += deploy/mesos-deploy-env.sh.template \ - deploy/mesos-master-env.sh.template \ - deploy/mesos-slave-env.sh.template +pkgsysconf_DATA += deploy/mesos-deploy-env.sh.template \ + deploy/mesos-master-env.sh.template \ + deploy/mesos-slave-env.sh.template # Need to explicitly add this because by default DATA files are not # included in distributions. http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-daemon.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-daemon.sh.in b/src/deploy/mesos-daemon.sh.in index b9866ac..e929738 100644 --- a/src/deploy/mesos-daemon.sh.in +++ b/src/deploy/mesos-daemon.sh.in @@ -3,7 +3,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -deploy_dir=@localstatedir@/@PACKAGE@/deploy +deploy_dir=@sysconfdir@/@PACKAGE@ # Increase the default number of open file descriptors. ulimit -n 8192 http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-start-cluster.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-cluster.sh.in b/src/deploy/mesos-start-cluster.sh.in index 500fb5c..f7a003d 100644 --- a/src/deploy/mesos-start-cluster.sh.in +++ b/src/deploy/mesos-start-cluster.sh.in @@ -3,7 +3,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy +DEPLOY_DIR=@sysconfdir@/@PACKAGE@ # Pull in deploy specific options. test -e ${DEPLOY_DIR}/mesos-deploy-env.sh && \ http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-start-masters.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-masters.sh.in b/src/deploy/mesos-start-masters.sh.in index 36641ec..b61006d 100644 --- a/src/deploy/mesos-start-masters.sh.in +++ b/src/deploy/mesos-start-masters.sh.in @@ -3,7 +3,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy +DEPLOY_DIR=@sysconfdir@/@PACKAGE@ # Pull in deploy specific options. test -e ${DEPLOY_DIR}/mesos-deploy-env.sh && \ http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-start-slaves.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-start-slaves.sh.in b/src/deploy/mesos-start-slaves.sh.in index 8661c8d..50860f4 100644 --- a/src/deploy/mesos-start-slaves.sh.in +++ b/src/deploy/mesos-start-slaves.sh.in @@ -3,7 +3,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy +DEPLOY_DIR=@sysconfdir@/@PACKAGE@ # Pull in deploy specific options. test -e ${DEPLOY_DIR}/mesos-deploy-env.sh && \ http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-stop-masters.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-stop-masters.sh.in b/src/deploy/mesos-stop-masters.sh.in index c85c977..34ac6c4 100644 --- a/src/deploy/mesos-stop-masters.sh.in +++ b/src/deploy/mesos-stop-masters.sh.in @@ -2,7 +2,7 @@ prefix=@prefix@ -DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy +DEPLOY_DIR=@sysconfdir@/@PACKAGE@ # Pull in deploy specific options. test -e ${DEPLOY_DIR}/mesos-deploy-env.sh && \ http://git-wip-us.apache.org/repos/asf/mesos/blob/fd798ffb/src/deploy/mesos-stop-slaves.sh.in ---------------------------------------------------------------------- diff --git a/src/deploy/mesos-stop-slaves.sh.in b/src/deploy/mesos-stop-slaves.sh.in index ea5b26a..3dd9b51 100644 --- a/src/deploy/mesos-stop-slaves.sh.in +++ b/src/deploy/mesos-stop-slaves.sh.in @@ -1,7 +1,7 @@ #!/usr/bin/env bash prefix=@prefix@ -DEPLOY_DIR=@localstatedir@/@PACKAGE@/deploy +DEPLOY_DIR=@sysconfdir@/@PACKAGE@ # Pull in deploy specific options. test -e ${DEPLOY_DIR}/mesos-deploy-env.sh && \
