--- doc/loncapafiles/sanitycheck.piml	2009/07/13 00:06:23	1.27
+++ doc/loncapafiles/sanitycheck.piml	2012/07/30 01:37:22	1.37
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.27 2009/07/13 00:06:23 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.37 2012/07/30 01:37:22 raeburn Exp $ -->
 
 <!--
 
@@ -60,6 +60,8 @@ else
 </file>
 <file>
 <target dist='default'>/var/lib/mysql/mysql.sock</target>
+<target dist='suse11.2 suse11.3 suse11.4 suse12.1'>/var/run/mysql/mysql.sock</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/var/run/mysqld/mysqld.sock</target>
 <perlscript mode='fg'>
 unless
     (-e '<TARGET />') # Does file exist?
@@ -111,7 +113,7 @@ else # It exists, so look at the file me
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
@@ -167,7 +169,7 @@ while (my $l = &lt;IN&gt;) {
       $a[1]=~/[^\w\-.]/ ||
       $a[0]=~/\_/       ||
       $a[1]=~/\_/      ) { $dbug=1; push(@{$line{'d'}},$line); }
-  if (@a<4 || @a>5) {      $fbug=1; push(@{$line{'f'}},$line); }
+  if (@a<6 || @a>6) {      $fbug=1; push(@{$line{'f'}},$line); }
   my $expr='\s.+$';
   if ($a[0] =~ /$expr/ ||
       $a[1] =~ /$expr/ ||
@@ -184,7 +186,7 @@ if ($dbug) {
   print "**** ERROR **** <TARGET /> has invalid host id or domain id (lines ".join(', ',@{$line{'d'}}).")\n";
 }
 if ($fbug) {
-  print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row (lines ".join(', ',@{$line{'f'}}).")\n";
+  print "**** ERROR **** <TARGET /> is lacking 6 columns for every row (lines ".join(', ',@{$line{'f'}}).")\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character (lines ".join(', ',@{$line{'s'}}).")\n";