From 71af846c1180449f80b01b337c146b6cff8ca01f Mon Sep 17 00:00:00 2001 From: alban Date: Sun, 8 Oct 2017 10:41:56 +0200 Subject: [PATCH 1/2] [fix] spoolsize du should be in summary mode --- src/spoolsize.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/spoolsize.php b/src/spoolsize.php index d32143c1..4ae6c285 100644 --- a/src/spoolsize.php +++ b/src/spoolsize.php @@ -22,7 +22,7 @@ if ($db->query("SELECT uid,login FROM membres;")) { } else { // The QUOTA system being disabled, we need to use 'du' on each folder. $login = $db->f('login'); - $size=exec("/usr/bin/du /var/www/alternc/".substr($login,0,1)."/".$login); + $size=exec("/usr/bin/du -s /var/www/alternc/".substr($login,0,1)."/".$login); } $db2->query("REPLACE INTO size_web SET uid=?, size=?;",array(intval($db->f('uid')),intval($size))); echo $db->f('login')." (".(round($size/1024, 1))." MB)\n"; @@ -58,9 +58,9 @@ if ($db->query("SELECT uid, name FROM mailman;")) { } foreach ($cc as $c){ echo $c["uid"]."/".$c["name"]; flush(); - $size1=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/lists/".$c["name"])); - $size2=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"])); - $size3=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"].".mbox")); + $size1=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/lists/".$c["name"])); + $size2=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"])); + $size3=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"].".mbox")); $size=(intval($size1)+intval($size2)+intval($size3)); $db->query("REPLACE INTO size_mailman SET uid=?,list=?,size=?;",array($c["uid"],$c["name"],$size)); echo " done (".(round($size/1024, 1))." MB) \n"; flush(); From 13c761f0825ad408ace77530c95a9d514f1b8144 Mon Sep 17 00:00:00 2001 From: azerttyu Date: Sun, 8 Oct 2017 10:47:44 +0200 Subject: [PATCH 2/2] We must check a file not a directory complete 3f9d2c272961a7bdf76967901b280007b8b06c29 --- install/alternc.install | 2 +- jessie/alternc.install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/alternc.install b/install/alternc.install index f9c8d4c0..f7222465 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -627,7 +627,7 @@ done # Fix some perms # Fix phpmyadmin import trac#1557 test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true -test -d "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true +test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true # hook run-parts --arg=end /usr/lib/alternc/install.d diff --git a/jessie/alternc.install b/jessie/alternc.install index 5d35007b..a44d191c 100644 --- a/jessie/alternc.install +++ b/jessie/alternc.install @@ -636,7 +636,7 @@ done # Fix some perms # Fix phpmyadmin import trac#1557 test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true -test -d "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true +test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true # hook run-parts --arg=end /usr/lib/alternc/install.d