Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
Zimbra
zm-launcher
Commits
1b764be1
Commit
1b764be1
authored
7 years ago
by
Rupali Desai
Browse files
Options
Download
Plain Diff
Merge branch 'release/8.8.4'
parents
4d647bb0
81722578
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
.gitignore
.gitignore
+1
-0
Makefile
Makefile
+4
-2
src/launcher/zmmailboxdmgr.c
src/launcher/zmmailboxdmgr.c
+9
-8
No files found.
.gitignore
0 → 100644
View file @
1b764be1
build
This diff is collapsed.
Click to expand it.
Makefile
View file @
1b764be1
...
...
@@ -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)
"'
\
...
...
This diff is collapsed.
Click to expand it.
src/launcher/zmmailboxdmgr.c
View file @
1b764be1
...
...
@@ -570,20 +570,21 @@ Start(int nextArg, int argc, char *argv[])
* AddArg("-jre-no-restrict-search");
*/
AddArgFmt
(
"-Djava.io.tmpdir=%s/work"
,
MAILBOXD_HOM
E
);
AddArgFmt
(
"-Djava.io.tmpdir=%s/work"
,
JETTY_BAS
E
);
AddArgFmt
(
"-Djava.library.path=%s"
,
ZIMBRA_LIB
);
AddArgFmt
(
"-Djava.endorsed.dirs=%s/common/endorsed"
,
MAILBOXD_HOM
E
);
AddArgFmt
(
"-Djava.endorsed.dirs=%s/common/endorsed"
,
JETTY_BAS
E
);
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_HOM
E
);
AddArgFmt
(
"%s/etc/jetty.xml"
,
MAILBOXD_HOM
E
);
AddArgFmt
(
"jetty.home=%s"
,
JETTY
_HOME
);
AddArgFmt
(
"jetty.base=%s"
,
JETTY_BAS
E
);
AddArgFmt
(
"%s/etc/jetty.xml"
,
JETTY_BAS
E
);
if
(
Verbose
)
{
ShowNewEnv
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment