Author: reinhard
Date: 2009-10-18 07:23:44 -0500 (Sun, 18 Oct 2009)
New Revision: 9984
Modified:
trunk/gnue-common/src/base/utils.py
Log:
Minor changes in configuration search path.
Modified: trunk/gnue-common/src/base/utils.py
===================================================================
--- trunk/gnue-common/src/base/utils.py 2009-10-17 11:21:02 UTC (rev 9983)
+++ trunk/gnue-common/src/base/utils.py 2009-10-18 12:23:44 UTC (rev 9984)
@@ -47,19 +47,19 @@
2. system configuration directory (usually /etc/gnue/*.d/)
3. user configuration (~/.gnue/*.conf)
4. local configuration (etc/*.conf)
- 5. environment variable location ($GNUE_*)
+ 5. environment variable location ($GNUE_*_CONF)
6. fixed system configuration (/etc/gnue/*.conf.fixed)
The practical use for 6. is to define configuration entries that cannot be
overwritten by normal users.
- For example, if name is C{connections}, on a standard install on a POSIX
+ For example, if name is C{backends}, on a standard install on a POSIX
system, the file would be searched in:
- 1. C{/etc/gnue/connections.conf}
- 2. C{/etc/gnue/connections.d/*}
- 3. C{~/.gnue/connections.conf}
- 4. C{etc/connections.conf} (from the current directory)
- 5. the content of the C{GNUE_CONNECTIONS} environment variable
- 6. C{/etc/gnue/connections.conf.fixed}
+ 1. C{/etc/gnue/backends.conf}
+ 2. C{/etc/gnue/backends.d/*}
+ 3. C{~/.gnue/backends.conf}
+ 4. C{etc/backends.conf} (from the current directory)
+ 5. the content of the C{GNUE_BACKENDS_CONF} environment variable
+ 6. C{/etc/gnue/backends.conf.fixed}
@param name: name of the configuration file without the .conf ending
@type name: string
@@ -87,8 +87,8 @@
files.append(os.path.join('etc', name + '.conf'))
# 5. environment variable location ($GNUE_*)
- if os.environ.has_key('GNUE_' + name.upper()):
- files.append(os.environ['GNUE_' + name.upper()])
+ if os.environ.has_key('GNUE_' + name.upper() + '_CONF'):
+ files.append(os.environ['GNUE_' + name.upper() + '_CONF'])
# 6. fixed system configuration (/etc/gnue/*.conf.fixed)
files.append(os.path.join(paths.config, name + '.conf.fixed'))
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
