diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index 6f3281f0..98604242 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -419,9 +419,6 @@ class m_dom { } } - //on corrige les permissions - exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid); - // Creation des 3 sous-domaines par défaut : Vide, www et mail $this->set_sub_domain($domain, '', $this->type_url, 'http://www.'.$domain); $this->set_sub_domain($domain, 'www', $this->type_local, '/'. $domshort); diff --git a/bureau/class/m_quota.php b/bureau/class/m_quota.php index 5195178d..c3445121 100644 --- a/bureau/class/m_quota.php +++ b/bureau/class/m_quota.php @@ -180,9 +180,9 @@ class m_quota { if (floatval($size)==0) $size="0"; if (isset($this->disk[$ressource])) { // It's a disk resource, update it with shell command - exec("/usr/lib/alternc/quota_edit $cuid $size"); + exec("/usr/lib/alternc/quota_edit $cuid $size &> /dev/null &"); // Now we check that the value has been written properly : - exec("usr/lib/alternc/quota_get $cuid",$a); + exec("/usr/lib/alternc/quota_get $cuid &> /dev/null &",$a); if ($size!=$a[1]) { $err->raise("quota",1); return false; diff --git a/install/mysql.sh b/install/mysql.sh index f2d8c277..97d7d9f5 100755 --- a/install/mysql.sh +++ b/install/mysql.sh @@ -164,9 +164,6 @@ set_value database $database $MYSQL_MAIL_CONFIG set_value user $alternc_mail_user $MYSQL_MAIL_CONFIG set_value password $alternc_mail_password $MYSQL_MAIL_CONFIG -echo $SED_SCRIPT_MAIL -echo XXXXXX -echo $SED_SCRIPT_USR # take extra precautions here with the mysql password: # put the sed script in a temporary file @@ -192,10 +189,9 @@ mysql_mail="/usr/bin/mysql --defaults-file=$MYSQL_MAIL_CONFIG" echo "Checking for MySQL connectivity" $mysql -e "SHOW TABLES" >/dev/null && echo "MYSQL.SH OK!" || echo "MYSQL.SH FAILED: database user setup failed" -echo $grant_mail # Final mysql setup: db schema echo "installing AlternC schema in $database..." $mysql < /usr/share/alternc/install/mysql.sql || echo cannot load database schema $mysql <