overhaul the settings concept:

  * now all settings live in the settings file, no more settings table in the DB
  * clearified slxsettings and its options
  * removed all references to db table 'settings'
  * added some new extended settings


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@988 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 0 insertions, 89 deletions

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index 78a13e05..dc3850ba 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -364,14 +364,6 @@ sub fetchGroupIDsOfClient
 	return $self->{'meta-db'}->fetchGroupIDsOfClient($clientID);
 }
 
-sub fetchSettings
-{
-	my $self = shift;
-
-	my @rows = $self->{'meta-db'}->fetchSettings();
-	return shift @rows;
-}
-
 ################################################################################
 ### data manipulation interface
 ################################################################################
@@ -805,14 +797,6 @@ sub emptyDatabase
 	$self->removeVendorOS(\@vendorOSIDs);
 }
 
-sub changeSettings
-{
-	my $self = shift;
-	my $settings = shift;
-
-	return $self->{'meta-db'}->changeSettings($settings);
-}
-
 ################################################################################
 ### data aggregation interface
 ################################################################################
diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm
index e1e6750b..a9424031 100644
--- a/config-db/OpenSLX/DBSchema.pm
+++ b/config-db/OpenSLX/DBSchema.pm
@@ -158,11 +158,6 @@ $DbSchema = {
 			'group_id:fk',		# foreign key
 			'system_id:fk',		# foreign key
 		],
-		'settings' => [
-			# system-wide settings
-			'default_nicmods:s.256',
-								# list of default network modules
-		],
 	},
 };
 
@@ -262,17 +257,6 @@ $DbSchema = {
 			'table' => 'group_system_ref',
 			'cols' => $DbSchema->{'tables'}->{'group_system_ref'},
 		},
-		{
-			'cmd' => 'add-table',
-			'table' => 'settings',
-			'cols' => $DbSchema->{'tables'}->{'settings'},
-			'vals' => [
-				{	# add default configuration
-					'default_nicmods'
-						=> 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32',
-				},
-			],
-		},
 	],
 );
 
diff --git a/config-db/OpenSLX/MetaDB/Base.pm b/config-db/OpenSLX/MetaDB/Base.pm
index 2d6f0374..db1f2e7e 100644
--- a/config-db/OpenSLX/MetaDB/Base.pm
+++ b/config-db/OpenSLX/MetaDB/Base.pm
@@ -115,10 +115,6 @@ sub fetchGroupIDsOfSystem
 {
 }
 
-sub fetchSettings
-{
-}
-
 ################################################################################
 ### data manipulation interface
 ################################################################################
@@ -215,10 +211,6 @@ sub setSystemIDsOfGroup
 {
 }
 
-sub changeSettings
-{
-}
-
 ################################################################################
 ### schema related functions
 ################################################################################
@@ -786,21 +778,6 @@ An array of client-IDs.
 
 
 
-=item C<fetchSettings()>
-
-Fetches all entries of the settings table, where a single row holds the info
-about all system wide configuration parameters.
-
-=over
-
-=item Return Value
-
-A hash containing all column values of the single row that lives
-int the settings table.
-
-=back
-
-
 =head2 Data Manipulation Methods
 
 The following methods need to be implemented in a MetaDB driver in order to
@@ -1234,26 +1211,6 @@ C<1> if the group/system references could be set, C<undef> if not.
 
 
 
-=item C<changeSettings(%$settings)>
-
-Changes one or more of the system-wide setting parameters.
-
-=over
-
-=item Param C<settings>
-
-A hash-ref containing the column-names you'd like to change with their new
-values.
-
-=item Return Value
-
-C<1> if the settings could be changed, C<undef> if not.
-
-=back
-
-
-
-
 
 
 =head2 Schema Related Methods
diff --git a/config-db/OpenSLX/MetaDB/DBI.pm b/config-db/OpenSLX/MetaDB/DBI.pm
index 9678afe4..29e9bb41 100644
--- a/config-db/OpenSLX/MetaDB/DBI.pm
+++ b/config-db/OpenSLX/MetaDB/DBI.pm
@@ -323,13 +323,6 @@ sub fetchGroupIDsOfClient
 	return $self->_doSelect($sql, 'group_id');
 }
 
-sub fetchSettings
-{
-	my $self = shift;
-	my $sql = "SELECT * FROM settings";
-	return $self->_doSelect($sql);
-}
-
 ################################################################################
 ### data manipulation functions
 ################################################################################
@@ -704,13 +697,6 @@ sub setSystemIDsOfGroup
 						   'group_id', 'system_id', \@currSystems);
 }
 
-sub changeSettings
-{
-	my $self = shift;
-	my $settings = shift;
-	return $self->_doUpdate('settings', undef, [ $settings ]);
-}
-
 ################################################################################
 ### schema related functions
 ################################################################################