1.4.062100

dtouzeau · Jun 20, 2010 · 3e50e4d · 3e50e4d
1 parent a193ae0
commit 3e50e4d
Show file tree

Hide file tree

Showing 130 changed files with 1,215 additions and 803 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.061819
+1.4.062100
diff --git a/WHATSNEW b/WHATSNEW
@@ -17,6 +17,7 @@ Messaging Changes:
 1.4.060401: Fix demime error before backup mails. This cause illimited stored mysql error files in /var/log/artica-postfix that cause crash server.
 1.4.061220: Adding Zarafa ICal/CalDav process startup/monitor.
 1.4.061320: Fix unable to start amavis when detected server name match xxx.(none)
+1.4.062001: Rebuild totally the multiple postfix instances engine (now each organization can store multiple mail servers)
 
 
 Proxy Changes:

diff --git a/artica.performances.php b/artica.performances.php
@@ -562,7 +562,7 @@ function main_config_artica(){
 $cpuLimitEnabled=trim($sock->GET_INFO("cpuLimitEnabled"));
 $SystemV5CacheEnabled=trim($sock->GET_INFO("SystemV5CacheEnabled"));
 
-if(strlen(trim($SystemV5CacheEnabled))==0){$SystemV5CacheEnabled=1;}
+if(strlen(trim($SystemV5CacheEnabled))==0){$SystemV5CacheEnabled=0;}
 
 $systemMaxOverloaded=trim($sock->GET_INFO("systemMaxOverloaded"));
 

diff --git a/bin/artica-compile b/bin/artica-compile
diff --git a/bin/artica-install b/bin/artica-install
diff --git a/bin/src/artica-install/amavisd_milter.pas b/bin/src/artica-install/amavisd_milter.pas
@@ -102,12 +102,6 @@ constructor tamavis.Create(const zSYS:Tsystem);
        if not TryStrToInt(SYS.GET_INFO('EnablePostfixMultiInstance'),EnablePostfixMultiInstance) then EnablePostfixMultiInstance:=0;
 
 
-       if EnablePostfixMultiInstance=1 then begin
-           EnableAmavisDaemon:=0;
-           JCheckMailEnabled:=0;
-           EnableAmavisInMasterCF:=0;
-       end;
-
        if EnableAmavisDaemon=1 then begin
           if not SYS.ISMemoryHiger1G() then begin
              logs.NOTIFICATION('[ARTICA]: ('+SYS.HOSTNAME_g()+') Warning: your memory is under 1GB ['+IntToStr(mem_installee)+'], amavis is now disabled','Amavis is disabled because your computer is not "memory compliance"','system');