Fix stupid errors in templates

tags/smeserver-dl-0.2.1-1
Daniel Berteaud 11 years ago
parent 68c0e65c58
commit 668f97e5ba
  1. 3
      root/etc/e-smith/templates/etc/dl.php/60ClamScan
  2. 2
      root/etc/e-smith/templates/etc/e-smith/sql/init/dl

@ -2,7 +2,7 @@
my $clam = $clamd{'status'} || 'disabled'; my $clam = $clamd{'status'} || 'disabled';
return '' unless ($clam eq 'enabled'); return '' unless ($clam eq 'enabled');
my $max = $clamav{StreamMaxLength} || '25M'; my $max = $clamav{StreamMaxLength} || '25M';
my $limit = $max my $limit = $max;
$limit =~ s/[KMG]$//; $limit =~ s/[KMG]$//;
if ($max =~ m/G$/){ if ($max =~ m/G$/){
$limit = $limit * 1024 * 1024 * 1024; $limit = $limit * 1024 * 1024 * 1024;
@ -18,4 +18,5 @@ $limit -= 1024 * 1024;
$OUT .=<<"EOF"; $OUT .=<<"EOF";
\$clamdScan = 'unix:///var/clamav/clamd.socket'; \$clamdScan = 'unix:///var/clamav/clamd.socket';
\$scanMax = $limit; \$scanMax = $limit;
EOF
} }

@ -3,7 +3,7 @@ my $db = $dl{'DbName'} || 'dl';
my $user = $dl{'DbUser'} || 'dl'; my $user = $dl{'DbUser'} || 'dl';
my $pass = $dl{'DbPassword'} || 'secret'; my $pass = $dl{'DbPassword'} || 'secret';
my $dbstruct = `rpm -qd dl | grep mysql.sql`; my $dbstruct = `rpm -ql dl | grep mysql.sql`;
$OUT .= <<"END"; $OUT .= <<"END";
#! /bin/sh #! /bin/sh

Loading…
Cancel
Save