[fluo-uno] branch master updated: Allow some env to be set outside config (#182)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-uno.git


The following commit(s) were added to refs/heads/master by this push:
     new dcfe2e1  Allow some env to be set outside config (#182)
dcfe2e1 is described below

commit dcfe2e1a38571494e5d835b1783718d0d73334f4
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jun 14 16:55:43 2018 -0400

    Allow some env to be set outside config (#182)
    
    I wanted to temporarily set a different version and local host name
    without editing the config file, so I thought it would be easier to
    allow these environment variables to be set outside the configuration
    script. The change allows them to use whatever was set in the
    environment, and default to the config file if not set.
    
    Also, add checksum for Hadoop 3.0.2
---
 conf/checksums |  1 +
 conf/uno.conf  | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf/checksums b/conf/checksums
index e2de91a..56918cf 100644
--- a/conf/checksums
+++ b/conf/checksums
@@ -3,6 +3,7 @@ accumulo:1.9.0:f68a6145029a9ea843b0305c90a7f5f0334d8a8ceeea94734267ec36421fe7fe
 accumulo:1.8.1:eba3bfe823935ca7901ea7c2bd59c84a68b9381361699c7e260bbd9191f237f4
 accumulo:1.7.4:3776dddbc2a09f4a9d7a2ae4958e212e91eb5067a124a628330edbee4e32e754
 accumulo:1.7.3:294f2f1f3fbc164b68e80cecd5a6ce5c245df804fb35ae5e03ab1c86bc9480da
+hadoop:3.0.2:0d507aa71007b2685e292343c11c2cb90a92ea7625446b57d1fb47c5721e2f82
 hadoop:2.9.0:8d48666f29f9ade6ed2762b7a9edab177bad2c57396f43d0ffd6a269d54f6fe1
 hadoop:2.8.3:e8bf9a53337b1dca3b152b0a5b5e277dc734e76520543e525c301a050bb27eae
 hadoop:2.7.6:f2327ea93f4bc5a5d7150dee8e0ede196d3a77ff8526a7dd05a48a09aae25669
diff --git a/conf/uno.conf b/conf/uno.conf
index e59eee9..eff6cee 100644
--- a/conf/uno.conf
+++ b/conf/uno.conf
@@ -3,12 +3,12 @@
 
 # Versions
 # --------
-export HADOOP_VERSION=2.7.6
-export ZOOKEEPER_VERSION=3.4.12
-export ACCUMULO_VERSION=1.9.1
-export SPARK_VERSION=1.6.3
-export FLUO_VERSION=1.2.0
-export FLUO_YARN_VERSION=1.0.0
+export HADOOP_VERSION=${HADOOP_VERSION:-2.7.6}
+export ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.12}
+export ACCUMULO_VERSION=${ACCUMULO_VERSION:-1.9.1}
+export SPARK_VERSION=${SPARK_VERSION:-1.6.3}
+export FLUO_VERSION=${FLUO_VERSION:-1.2.0}
+export FLUO_YARN_VERSION=${FLUO_YARN_VERSION:-1.0.0}
 
 # Hashes (supports MD5, SHA-1, SHA-256, and SHA-512; MD5 requires md5sum)
 # --------------
@@ -26,7 +26,7 @@ export GRAFANA_HASH=d3eaa2c45ae9f8e7424a7b0b74fa8c8360bd25a1f49545d8fb5a874ebf05
 # Network configuration
 # ---------------------
 # Hostname to use in configuration. Set to $(hostname) to use your hostname
-export UNO_HOST=localhost
+export UNO_HOST=${UNO_HOST:-localhost}
 
 # Download configuration
 # ----------------------

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.