Samba default Freigabe angepasst

Makegraphs fuer nicht ganz unix konforme disks angepasst

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@953 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/samba/default.pdc b/config/samba/default.pdc
index e0955af101c41a5af5d6b55e9bd1b2471582bc47..73d2c4f9b0da7ec8829257eefc4efdac6f2f0d8b 100644 (file)
--- a/config/samba/default.pdc
+++ b/config/samba/default.pdc
@@ -1,19 +1,19 @@
-[homes]\r
-path = /home/%u\r
-comment = Benutzer-Verzeichnisse\r
-browseable = yes\r
-writeable = yes\r
-valid users = %S\r
-\r
-[netlogon]\r
-path = /var/ipfire/samba/netlogon\r
-browseable = no\r
-writeable = no\r
-comment = NetLogON\r
-\r
-[profiles]\r
-path = /var/ipfire/samba/profiles\r
-browseable = no\r
-writeable = yes\r
-comment = Benutzerprofile\r
-valid users = %S\r
+[homes]
+path = /home/%U
+comment = Benutzer-Verzeichnisse
+browseable = yes
+writeable = yes
+valid users = %U
+
+[netlogon]
+path = /var/ipfire/samba/netlogon
+browseable = no
+writeable = no
+comment = NetLogON
+
+[profiles]
+path = /var/ipfire/samba/profiles
+browseable = no
+writeable = yes
+comment = Benutzerprofile
+valid users = %U

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index eb1ee439bc67b9015c1f8c4cd79caf98021f2044..92eba691b5ff1835fb2766c71a7393277f2ff111 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -235,8 +235,9 @@ sub updatememdata {
 sub updatediskdata {
         my $disk = $_[0];
         my ($readsect, $writesect, $trash);
-        if ( ! -e "$rrdlog/disk-$disk.rrd") {
-                RRDs::create ("$rrdlog/disk-$disk.rrd", "--step=300",
+                               my @array = split(/\//,$disk);
+        if ( ! -e "$rrdlog/disk-".$array[$#array].".rrd") {
+                RRDs::create ("$rrdlog/disk-".$array[$#array].".rrd", "--step=300",
                         "DS:readsect:COUNTER:600:0:5000000000",
                         "DS:writesect:COUNTER:600:0:5000000000",
                         "RRA:AVERAGE:0.5:1:576",
@@ -253,7 +254,7 @@ sub updatediskdata {
         print "\nread:".$readsect."write:".$writesect."\n";
 
         if ($readsect && $writesect) {
-                RRDs::update ("$rrdlog/disk-$disk.rrd",
+                RRDs::update ("$rrdlog/disk-".$array[$#array].".rrd",
                         "-t", "readsect:writesect",
                         "N:$readsect:$writesect");
                 $ERROR = RRDs::error;
@@ -404,38 +405,39 @@ sub updatehdddata
 {
   my $disk = $_[0];
   my $standby;
+  my @array = split(/\//,$disk);
   
-  if ( ! -e "$rrdlog/hddshutdown-$disk.rrd") 
+  if ( ! -e "$rrdlog/hddshutdown-".$array[$#array].".rrd") 
   {
     # database did not exist -> create
-    RRDs::create ("$rrdlog/hddshutdown-$disk.rrd", "--step=300",
+    RRDs::create ("$rrdlog/hddshutdown-".$array[$#array].".rrd", "--step=300",
       "DS:standby:GAUGE:600:0:1",
       "RRA:AVERAGE:0.5:1:576",
       "RRA:AVERAGE:0.5:6:672",
       "RRA:AVERAGE:0.5:24:732",
       "RRA:AVERAGE:0.5:144:1460");
     $ERROR = RRDs::error;
-    print "Error in RRD::create for hddshutdown-$disk: $ERROR\n" if $ERROR;
+    print "Error in RRD::create for hddshutdown-".$array[$#array].": $ERROR\n" if $ERROR;
   }
 
-  if (-e "/tmp/hddshutdown-$disk") {$standby = 1;}
+  if (-e "/tmp/hddshutdown-".$array[$#array]) {$standby = 1;}
     else {$standby = 0;}
 
-  RRDs::update ("$rrdlog/hddshutdown-$disk.rrd", "-t", "standby", "N:$standby");
+  RRDs::update ("$rrdlog/hddshutdown-".$array[$#array].".rrd", "-t", "standby", "N:$standby");
   $ERROR = RRDs::error;
-  print "Error in RRD::update for hddshutdown-$disk: $ERROR\n" if $ERROR;
+  print "Error in RRD::update for hddshutdown-".$array[$#array].": $ERROR\n" if $ERROR;
 
-  if ( ! -e "$rrdlog/hddtemp-$disk.rrd") 
+  if ( ! -e "$rrdlog/hddtemp-".$array[$#array].".rrd") 
   {
     # database did not exist -> create
-    RRDs::create ("$rrdlog/hddtemp-$disk.rrd", "--step=300",
+    RRDs::create ("$rrdlog/hddtemp-".$array[$#array].".rrd", "--step=300",
       "DS:temperature:GAUGE:600:0:100",
       "RRA:AVERAGE:0.5:1:576",
       "RRA:AVERAGE:0.5:6:672",
       "RRA:AVERAGE:0.5:24:732",
       "RRA:AVERAGE:0.5:144:1460");
     $ERROR = RRDs::error;
-    print "Error in RRD::create for hdd-$disk: $ERROR\n" if $ERROR;
+    print "Error in RRD::create for hdd-".$array[$#array].": $ERROR\n" if $ERROR;
   }
 
   # Temperaturlesen wÃrde die Platte aufwecken!!!
@@ -480,9 +482,9 @@ sub updatehdddata
            $temp = $1;
        }
     }
-    elsif ( -e "/var/log/smartctl_out_hddtemp-$disk" )
+    elsif ( -e "/var/log/smartctl_out_hddtemp-".$array[$#array] )
     {
-       $hdd_output = `cat /var/log/smartctl_out_hddtemp-$disk | grep Temperature_`;
+       $hdd_output = `cat /var/log/smartctl_out_hddtemp-".$array[$#array]." | grep Temperature_`;
        my @t = split(/\s+/,$hdd_output);
        $temp = $t[9];
     }
@@ -492,13 +494,13 @@ sub updatehdddata
     }
   
 
-    print "Temperature for ".$disk."->".$temp."<-\n";
+    print "Temperature for ".$array[$#array]."->".$temp."<-\n";
     # Nur ins RDD wenn nicht 0 (sonst klappt die min Anzeige nicht)
     if ($temp)
     {
-       RRDs::update ("$rrdlog/hddtemp-$disk.rrd", "-t", "temperature", "N:$temp");
+       RRDs::update ("$rrdlog/hddtemp-".$array[$#array].".rrd", "-t", "temperature", "N:$temp");
        $ERROR = RRDs::error;
-       print "Error in RRD::update for hdd-$disk: $ERROR\n" if $ERROR;
+       print "Error in RRD::update for hdd-".$array[$#array].": $ERROR\n" if $ERROR;
     }
   }
 }
@@ -605,8 +607,9 @@ print "Working on disk ".$disk.".\n";
 my $status = "";
 my $diskstats = "";
 my $newdiskstats = "";
+my @array = split(/\//,$disk);
 
-$diskstats = `cat /tmp/hddstats-$disk`;
+$diskstats = `cat /tmp/hddstats-$array[$#array]`;
 chomp $diskstats;
 my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
 chomp $newdiskstats;
@@ -615,13 +618,13 @@ chomp $status;
 
 if ($status !~/standby/ || $diskstats ne $newdiskstats)
 {
-    if (-e "/tmp/hddshutdown-$disk") 
+    if (-e "/tmp/hddshutdown-".$array[$#array]) 
     {
-      system("unlink /tmp/hddshutdown-$disk");
+      system("unlink /tmp/hddshutdown-".$array[$#array]);
     }
 }
 
-if (-e "/tmp/hddshutdown-$disk")  
+if (-e "/tmp/hddshutdown-".$array[$#array])  
 {
     $status = " standby\n";
 }