You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/06/23 05:46:17 UTC

[2/2] karaf git commit: [KARAF-4590] Document environment variable reference from configuration files

[KARAF-4590] Document environment variable reference from configuration files


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ce69d7df
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ce69d7df
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ce69d7df

Branch: refs/heads/master
Commit: ce69d7dfe9e190f4fbaef28cc56343c1262420f9
Parents: 93bd38e
Author: Ion Savin <co...@gmx.net>
Authored: Thu Jun 23 00:18:48 2016 +0300
Committer: Ion Savin <co...@gmx.net>
Committed: Thu Jun 23 00:18:57 2016 +0300

----------------------------------------------------------------------
 manual/src/main/asciidoc/user-guide/configuration.adoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ce69d7df/manual/src/main/asciidoc/user-guide/configuration.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/configuration.adoc b/manual/src/main/asciidoc/user-guide/configuration.adoc
index 165c765..ceb7468 100644
--- a/manual/src/main/asciidoc/user-guide/configuration.adoc
+++ b/manual/src/main/asciidoc/user-guide/configuration.adoc
@@ -33,6 +33,9 @@ A configuration file is a properties file containing key/value pairs:
 property=value
 ----
 
+Environment variables can be referenced inside configuration files using the syntax `${env:<variable_name>}` (e.g.
+`property=${env:FOO}` will set "property" to the value of the enviroment variable "FOO").
+
 In Apache Karaf, a configuration is PID with a set of properties attached.
 
 Apache Karaf automatically loads all `*.cfg` files from the `etc` folder.
@@ -71,7 +74,7 @@ service starts.
 this value is high, more verbose the configuration service is.
 * `felix.fileinstall.log.default` is the logging framework to use, `jul` meaning Java Util Logging.
 
-You can change the configuration at runtime by directly editiing the configuration file.
+You can change the configuration at runtime by directly editing the configuration file.
 
 You can also do the same using the `config:*` commands or the ConfigMBean.