From 186cc89e440017fc49907929105e0eb7ed31eaa9 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 28 May 2007 21:53:13 +0000
Subject: * part one of settings file related changes (ticket#122):   -
 'settings.default' now lives in /opt/openslx/share   - 'settings.local' has
 been renamed to 'settings'

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1103 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/slxsettings | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'config-db')

diff --git a/config-db/slxsettings b/config-db/slxsettings
index a95623c0..b6fd6e1e 100755
--- a/config-db/slxsettings
+++ b/config-db/slxsettings
@@ -20,7 +20,7 @@ slxsettings
     This script can be used to show or change the local settings for OpenSLX.
 
     Any cmdline-argument passed to this script will change the local OpenSLX
-    settings file (usually /etc/opt/openslx/settings.local).
+    settings file (usually /etc/opt/openslx/settings).
 
     If you invoke the script without any arguments, it will print the current
     settings and exit.
@@ -82,14 +82,14 @@ while (scalar @ARGV) {
 }
 
 # fetch current content of local settings file...
-my $settings = slurpFile("$openslxConfig{'config-path'}/settings.local");
+my $settings = slurpFile("$openslxConfig{'config-path'}/settings");
 
 my $changeCount;
 
 # ...set new values...
 foreach my $key (keys %givenSettings) {
 	next if $key eq 'config-path';
-		# config-path can't be changed, it is used to find settings.local
+		# config-path can't be changed, it is used to find settings
 	my $value = $givenSettings{$key};
 	next if !defined $value;
 	vlog 0, _tr("setting %s to '%s'", $key, $value) unless $quiet;
@@ -113,7 +113,7 @@ foreach my $key (@reset) {
 
 # ... and write local settings file if necessary
 if ($changeCount) {
-	my $f = "$openslxConfig{'config-path'}/settings.local";
+	my $f = "$openslxConfig{'config-path'}/settings";
 	open(SETTINGS, "> $f")
 		or die _tr("Unable to write local settings file '%s' (%s)", $f, $!);
 	print SETTINGS $settings;
@@ -208,7 +208,7 @@ value)
 B<slxsettings> can be used to show or change the local settings for OpenSLX.
 
 Any cmdline-argument passed to this script will change the local OpenSLX
-settings file (usually /etc/opt/openslx/settings.local).
+settings file (usually /etc/opt/openslx/settings).
 
 If you invoke the script without any arguments, it will print the current
 settings and exit.
-- 
cgit v1.2.3-55-g7522