Commit 1b764be1 authored by Rupali Desai's avatar Rupali Desai
Browse files

Merge branch 'release/8.8.4'

parents 4d647bb0 81722578
build
......@@ -19,7 +19,8 @@ MAILBOXD_MANAGER_PIDFILE ?= /opt/zimbra/log/zmmailboxd_manager.pid
MAILBOXD_MANAGER_DEPRECATED_PIDFILE ?= /opt/zimbra/log/zmmailboxd.pid
MAILBOXD_JAVA_PIDFILE ?= /opt/zimbra/log/zmmailboxd_java.pid
MAILBOXD_CWD ?= /opt/zimbra/log
MAILBOXD_HOME ?= /opt/zimbra/mailboxd
JETTY_BASE ?= /opt/zimbra/mailboxd
JETTY_HOME ?= /opt/zimbra/common/jetty_home
MAILBOXD_OUTFILE ?= /opt/zimbra/log/zmmailboxd.out
GC_OUTFILE ?= /opt/zimbra/log/gc.log
ZIMBRA_LIB ?= /opt/zimbra/lib
......@@ -32,7 +33,8 @@ LAUNCHER_CFLAGS = \
-DMAILBOXD_MANAGER_DEPRECATED_PIDFILE='"$(MAILBOXD_MANAGER_DEPRECATED_PIDFILE)"' \
-DMAILBOXD_JAVA_PIDFILE='"$(MAILBOXD_JAVA_PIDFILE)"' \
-DMAILBOXD_CWD='"$(MAILBOXD_CWD)"' \
-DMAILBOXD_HOME='"$(MAILBOXD_HOME)"' \
-DJETTY_BASE='"$(JETTY_BASE)"' \
-DJETTY_HOME='"$(JETTY_HOME)"' \
-DMAILBOXD_OUTFILE='"$(MAILBOXD_OUTFILE)"' \
-DGC_OUTFILE='"$(GC_OUTFILE)"' \
-DZIMBRA_LIB='"$(ZIMBRA_LIB)"' \
......
......@@ -570,20 +570,21 @@ Start(int nextArg, int argc, char *argv[])
* AddArg("-jre-no-restrict-search");
*/
AddArgFmt("-Djava.io.tmpdir=%s/work", MAILBOXD_HOME);
AddArgFmt("-Djava.io.tmpdir=%s/work", JETTY_BASE);
AddArgFmt("-Djava.library.path=%s", ZIMBRA_LIB);
AddArgFmt("-Djava.endorsed.dirs=%s/common/endorsed", MAILBOXD_HOME);
AddArgFmt("-Djava.endorsed.dirs=%s/common/endorsed", JETTY_BASE);
AddArgFmt("-Dzimbra.config=%s", ZIMBRA_CONFIG);
/* We don't want these things being passed in from command line */
AddArgFmt("-Djetty.home=%s", MAILBOXD_HOME);
AddArgFmt("-DSTART=%s/etc/start.config", MAILBOXD_HOME);
AddArgFmt("-Djetty.base=%s", JETTY_BASE);
AddArgFmt("-Djetty.home=%s", JETTY_HOME);
AddArgFmt("-DSTART=%s/etc/start.config", JETTY_BASE);
AddArg("-jar");
AddArgFmt("%s/start.jar", MAILBOXD_HOME);
AddArgFmt("%s/start.jar", JETTY_HOME);
AddArg("--module=zimbra,server,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,monitor,continuation,webapp,setuid");
AddArgFmt("jetty.home=%s", MAILBOXD_HOME);
AddArgFmt("jetty.base=%s", MAILBOXD_HOME);
AddArgFmt("%s/etc/jetty.xml", MAILBOXD_HOME);
AddArgFmt("jetty.home=%s", JETTY_HOME);
AddArgFmt("jetty.base=%s", JETTY_BASE);
AddArgFmt("%s/etc/jetty.xml", JETTY_BASE);
if (Verbose) {
ShowNewEnv();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment