From 668f97e5babb8e84c5cea92bde5b99cfc7e428d1 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 20 Nov 2013 13:11:15 +0100 Subject: [PATCH] Fix stupid errors in templates --- root/etc/e-smith/templates/etc/dl.php/60ClamScan | 3 ++- root/etc/e-smith/templates/etc/e-smith/sql/init/dl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/root/etc/e-smith/templates/etc/dl.php/60ClamScan b/root/etc/e-smith/templates/etc/dl.php/60ClamScan index 5ba6ab5..24ac2fa 100644 --- a/root/etc/e-smith/templates/etc/dl.php/60ClamScan +++ b/root/etc/e-smith/templates/etc/dl.php/60ClamScan @@ -2,7 +2,7 @@ my $clam = $clamd{'status'} || 'disabled'; return '' unless ($clam eq 'enabled'); my $max = $clamav{StreamMaxLength} || '25M'; -my $limit = $max +my $limit = $max; $limit =~ s/[KMG]$//; if ($max =~ m/G$/){ $limit = $limit * 1024 * 1024 * 1024; @@ -18,4 +18,5 @@ $limit -= 1024 * 1024; $OUT .=<<"EOF"; \$clamdScan = 'unix:///var/clamav/clamd.socket'; \$scanMax = $limit; +EOF } diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/dl b/root/etc/e-smith/templates/etc/e-smith/sql/init/dl index 5712eeb..e022ad7 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/dl +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/dl @@ -3,7 +3,7 @@ my $db = $dl{'DbName'} || 'dl'; my $user = $dl{'DbUser'} || 'dl'; my $pass = $dl{'DbPassword'} || 'secret'; -my $dbstruct = `rpm -qd dl | grep mysql.sql`; +my $dbstruct = `rpm -ql dl | grep mysql.sql`; $OUT .= <<"END"; #! /bin/sh