svn commit: r1132156 - in /incubator/mesos/trunk/src: Makefile.in conf/deploy-env.sh.template

[be...@apache.org]

Author: benh
Date: Sun Jun  5 08:51:59 2011
New Revision: 1132156

URL: http://svn.apache.org/viewvc?rev=1132156&view=rev
Log:
Cleaned up some issues relevant to the discussions from commit 6c62e96aca8937b3dc56.

Modified:
    incubator/mesos/trunk/src/Makefile.in
    incubator/mesos/trunk/src/conf/deploy-env.sh.template

Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132156&r1=1132155&r2=1132156&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun  5 08:51:59 2011
@@ -343,11 +343,11 @@ endif
 $(DEPLOY_FILES): $(DEPLOYDIR)/%: @srcdir@/deploy/% | $(DEPLOYDIR)
 	cp -r $< $@
 
-$(CONFDIR)/mesos.conf: @srcdir@/conf/mesos.conf.template | $(CONFDIR)
-	cp -r $< $@
+$(CONFDIR)/mesos.conf: | @srcdir@/conf/mesos.conf.template $(CONFDIR)
+	cp -r @srcdir@/conf/mesos.conf.template $@
 
-$(CONFDIR)/deploy-env.sh: @srcdir@/conf/deploy-env.sh.template | $(CONFDIR)
-	cp -r $< $@
+$(CONFDIR)/deploy-env.sh: | @srcdir@/conf/deploy-env.sh.template $(CONFDIR)
+	cp -r @srcdir@/conf/deploy-env.sh.template $@
 
 test: all
 	$(MAKE) -C tests test

Modified: incubator/mesos/trunk/src/conf/deploy-env.sh.template
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/conf/deploy-env.sh.template?rev=1132156&r1=1132155&r2=1132156&view=diff
==============================================================================
--- incubator/mesos/trunk/src/conf/deploy-env.sh.template (original)
+++ incubator/mesos/trunk/src/conf/deploy-env.sh.template Sun Jun  5 08:51:59 2011
@@ -1,14 +1,22 @@
 #!/bin/bash
-# This file contains environment variables that should be set when starting a Mesos
-# daemon (master or slave) with the deploy scripts. It can be used to configure SSH
-# options or set which IP addresses the daemons should bind to, for example.
+
+# This file contains environment variables that should be set when
+# starting a Mesos daemon (master or slave) with the deploy
+# scripts. It can be used to configure SSH options or set which IP
+# addresses the daemons should bind to, for example.
 
 # Options for SSH
 SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
 
-# Set LIBPROCESS_IP to change the address to which the master and slaves bind
-# if the default address chosen by the system is not the right one. We include
-# two examples below that try to resolve the IP from the node's hostname.
-#LIBPROCESS_IP="hostname -i" #works on older versions of hostname, not on OS X
-#FULL_IP="hostname --all-ip-addresses" # newer versions of hostname only
-#export LIBPROCESS_IP=`echo $FULL_IP|sed 's/\([^ ]*\) .*/\1/'`
+# Set LIBPROCESS_IP to change the address to which the master and
+# slaves bind if the default address chosen by the system is not the
+# right one. We include two examples below that try to resolve the IP
+# from the node's hostname.
+
+# This works with older versions of hostname, but not on Mac OS X.
+#LIBPROCESS_IP="hostname -i" 
+
+# This works with newer versions of hostname.
+#FULL_IP="hostname --all-ip-addresses" 
+
+#export LIBPROCESS_IP=`echo $FULL_IP | sed 's/\([^ ]*\) .*/\1/'`