fluo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] keith-turner closed pull request #188: Use conf/uno-local.conf if it exists
Date Tue, 14 Aug 2018 15:59:51 GMT
keith-turner closed pull request #188: Use conf/uno-local.conf if it exists
URL: https://github.com/apache/fluo-uno/pull/188
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/README.md b/README.md
index d290902..6888056 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,16 @@ your environment. Inside this script the variable `UNO_HOME` defaults to
the roo
 vim conf/uno.conf
 ```
 
+If you would like to avoid modifying `uno.conf` because it is managed by git,
+there is a second way to configure uno.  If `conf/uno-local.conf` exists then
+it is used instead of `uno.conf`.  After pulling the latest changes to
+Uno, a tool like meld can be used to compare `uno.conf` and `uno-local.conf`.
+
+```bash
+cp conf/uno.conf conf/uno-local.conf
+vim conf/uno-local.conf
+```
+
 All commands are run using the `uno` script in `bin/`. Uno has a command that helps you configure
 your shell so that you can run commands from any directory and easily set common environment
 variables in your shell for Uno, Hadoop, ZooKeeper, Fluo, and Spark. Run the following command
to
diff --git a/bin/impl/load-env.sh b/bin/impl/load-env.sh
index 6b579a7..b828f9e 100755
--- a/bin/impl/load-env.sh
+++ b/bin/impl/load-env.sh
@@ -42,7 +42,9 @@ AH=$ACCUMULO_HOME
 FH=$FLUO_HOME
 
 # Load env configuration
-if [[ -f "$UNO_HOME/conf/uno.conf" ]]; then
+if [[ -f "$UNO_HOME/conf/uno-local.conf" ]]; then
+  source "$UNO_HOME"/conf/uno-local.conf
+elif [[ -f "$UNO_HOME/conf/uno.conf" ]]; then
   source "$UNO_HOME"/conf/uno.conf
 else
   echo "ERROR: Configuration file $UNO_HOME/conf/uno.conf does not exist" 1>&2
diff --git a/conf/.gitignore b/conf/.gitignore
new file mode 100644
index 0000000..ad8378f
--- /dev/null
+++ b/conf/.gitignore
@@ -0,0 +1 @@
+uno-local.conf


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message