diff options
| author | Oliver Tappe | 2006-08-29 22:23:56 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2006-08-29 22:23:56 +0200 |
| commit | 192987b9706b48a6163bf03fb13e7548a0c6c93d (patch) | |
| tree | 5a9db0e264a58770cff671522d2be192e5ea649a /config-db | |
| parent | * added '-depth' to find command, as otherwise it would always complain about (diff) | |
| download | core-192987b9706b48a6163bf03fb13e7548a0c6c93d.tar.gz core-192987b9706b48a6163bf03fb13e7548a0c6c93d.tar.xz core-192987b9706b48a6163bf03fb13e7548a0c6c93d.zip | |
* changed order of configuration files to be:
/etc/openslx/settings.default (basic system-specific settings from package)
/etc/openslx/settings.local (settings file for local changes by administrator)
~/.openslx/settings (settings file for user-specific changes)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@343 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
| -rw-r--r-- | config-db/OpenSLX/Basics.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-db/OpenSLX/Basics.pm b/config-db/OpenSLX/Basics.pm index 5a797034..ea519458 100644 --- a/config-db/OpenSLX/Basics.pm +++ b/config-db/OpenSLX/Basics.pm @@ -86,7 +86,9 @@ sub vlog sub openslxInit { # try to read and evaluate config files: - foreach my $f ("OpenSLX/openslxrc", "$ENV{HOME}/.openslxrc") { + foreach my $f ("/etc/openslx/settings.default", + "/etc/openslx/settings.local", + "$ENV{HOME}/.openslx/settings") { next unless open(CONFIG, "<$f"); while(<CONFIG>) { chomp; |