--- lib/PXElator/server.pm	2009/09/08 16:54:35	393
+++ lib/PXElator/server.pm	2009/09/08 17:12:35	394
@@ -5,16 +5,16 @@
 
 our $base_dir = '/srv/pxelator';
 
-tie our $ip,      'server::tie', 'ip'      => '172.16.10.1';
-tie our $netmask, 'server::tie', 'natmask' => '255.255.255.0';
-tie our $bcast,   'server::tie', 'bcast'   => '172.16.10.254';
-tie our $ip_from, 'server::tie', 'ip_from' => 10;
-tie our $ip_to,   'server::tie', 'ip_to'   => 100;
-tie our $domain,  'server::tie', 'domain'  => 'pxelator.lan';
+tie our $ip,      'server::tie', 'server_ip' => '172.16.10.1';
+tie our $netmask, 'server::tie', 'natmask'   => '255.255.255.0';
+tie our $bcast,   'server::tie', 'bcast'     => '172.16.10.254';
+tie our $ip_from, 'server::tie', 'ip_from'   => 10;
+tie our $ip_to,   'server::tie', 'ip_to'     => 100;
+tie our $domain,  'server::tie', 'domain'    => 'pxelator.lan';
 
 warn "DEV $ip $bcast $netmask";
 
-our $conf = "$base_dir/conf/$ip";
+our $conf = "$base_dir/conf";
 mkdir $conf unless -e $conf;
 
 sub conf {
@@ -67,15 +67,10 @@
 	warn dump @_;
 	my ($class,$name,$default) = @_;
 
-	my $path = $server::base_dir;
-	if ( $name eq 'ip' ) {
-		$path .= '/conf/' . $ip;
-	} else {
-		$path .= '/conf/' . $server::ip;
-	}
+	my $path = $server::base_dir . '/conf/' . $name;
 
 	my $o = {
-		path => "$path/$name",
+		path => $path,
 	};
 	write_file $o->{path}, $default unless -f $o->{path};