Skip to content

Commit

Permalink
ZCS:2486 - Separated jetty.base and jetty.home, removed jetty-<version>
Browse files Browse the repository at this point in the history 
- Zimbra's Jetty Distribution (9.3.5.v20151012) is installed in /opt/zimbra/common/jetty_home/ via a separate package.
- Zimbra specific webapps and other custom jetty configuration files will be installed in /opt/zimbra/jetty_base/.
- Now /opt/zimbra/mailboxd and /opt/zimbra/jetty are symbolic links that point to /opt/zimbra/jetty_base/.
  • Loading branch information
Shriram V committed Aug 18, 2017
1 parent 42ac60a commit 838558a
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 46 deletions.
42 changes: 21 additions & 21 deletions conf/jetty/jetty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</Call>

<New id="zimbraSslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><SystemProperty name="jetty.home" default="." />/etc/keystore</Set>
<Set name="KeyStorePath"><SystemProperty name="jetty.base" default="." />/etc/keystore</Set>
<Set name="KeyStorePassword">zimbra</Set>
<Set name="KeyManagerPassword">zimbra</Set>
<Set name="EndpointIdentificationAlgorithm"></Set>
Expand Down Expand Up @@ -150,7 +150,7 @@
</Call>

<New id="zimbraSslClientContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><SystemProperty name="jetty.home" default="." />/etc/keystore</Set>
<Set name="KeyStorePath"><SystemProperty name="jetty.base" default="." />/etc/keystore</Set>
<Set name="KeyStorePassword">zimbra</Set>
<Set name="KeyManagerPassword">zimbra</Set>
<!-- uncomment following two lines when testing providing CAs from the trust store.
Expand Down Expand Up @@ -581,14 +581,14 @@
<Arg>
<Ref id="Contexts" />
</Arg>
<Arg><SystemProperty name="jetty.home" default="." />/webapps/service</Arg>
<Arg><SystemProperty name="jetty.base" default="." />/webapps/service</Arg>
<Arg>/service</Arg>
<Set name="configurationClasses">
<Ref id="plusConfig" />
</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="." />/etc/webdefault.xml
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="." />/etc/webdefault.xml
</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="." />/work/service
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="." />/work/service
</Set>
<Set name="compactPath">true</Set>
<Call name="setAttribute">
Expand All @@ -601,15 +601,15 @@
<Arg>
<Ref id="Contexts" />
</Arg>
<Arg><SystemProperty name="jetty.home" default="." />/webapps/zimbra
<Arg><SystemProperty name="jetty.base" default="." />/webapps/zimbra
</Arg>
<Arg>/</Arg>
<Set name="configurationClasses">
<Ref id="plusConfig" />
</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="." />/etc/webdefault.xml
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="." />/etc/webdefault.xml
</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="." />/work/zimbra
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="." />/work/zimbra
</Set>
<Set name="persistTempDirectory">true</Set>
<Set name="compactPath">true</Set>
Expand All @@ -635,15 +635,15 @@
<Arg>
<Ref id="Contexts" />
</Arg>
<Arg><SystemProperty name="jetty.home" default="." />/webapps/zimbraAdmin
<Arg><SystemProperty name="jetty.base" default="." />/webapps/zimbraAdmin
</Arg>
<Arg>/zimbraAdmin</Arg>
<Set name="configurationClasses">
<Ref id="plusConfig" />
</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="." />/etc/webdefault.xml
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="." />/etc/webdefault.xml
</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="." />/work/zimbraAdmin
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="." />/work/zimbraAdmin
</Set>
<Set name="compactPath">true</Set>
<Get name="sessionHandler">
Expand All @@ -662,21 +662,21 @@
<Arg>
<Ref id="Contexts" />
</Arg>
<Arg><SystemProperty name="jetty.home" default="." />/webapps/zimlet</Arg>
<Arg><SystemProperty name="jetty.base" default="." />/webapps/zimlet</Arg>
<Arg>/zimlet</Arg>
<Set name="configurationClasses">
<Ref id="plusConfig" />
</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="." />/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="." />/work/zimlet
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="." />/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="." />/work/zimlet
</Set>
<Set name="compactPath">true</Set>
<Set name="baseResource">
<New class="org.eclipse.jetty.util.resource.ResourceCollection">
<Arg>
<Array type="String">
<Item><SystemProperty name="jetty.home" default="." />/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.home" default="." />/../zimlets-deployed
<Item><SystemProperty name="jetty.base" default="." />/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.base" default="." />/../zimlets-deployed
</Item>
</Array>
</Arg>
Expand Down Expand Up @@ -747,14 +747,14 @@
<!-- Configure Authentication Realms -->
<!-- Realms may be configured for the entire server here, or -->
<!-- they can be configured for a specific web app in a context -->
<!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
<!-- configuration (see $(jetty.base)/contexts/test.xml for an -->
<!-- example). -->
<!-- =========================================================== -->

<!-- uncomment if global config attr zimbraSpnegoAuthEnabled is TRUE -->
<!-- zimbraSpnegoAuthEnabled <Call name="addBean"> <Arg> <New class="org.eclipse.jetty.security.SpnegoLoginService">
<Set name="name">Spnego Authentication Realm</Set> <Set name="config"><SystemProperty
name="jetty.home" default="."/>/etc/spnego.properties</Set> <Set name="IdentityService">
name="jetty.base" default="."/>/etc/spnego.properties</Set> <Set name="IdentityService">
<New class="org.eclipse.jetty.security.DefaultIdentityService"/> </Set> </New>
</Arg> </Call> zimbraSpnegoAuthEnabled -->
<!-- end uncomment if global config attr zimbraSpnegoAuthEnabled is TRUE -->
Expand Down Expand Up @@ -787,13 +787,13 @@
<!-- Configure Request Log -->
<!-- Request logs may be configured for the entire server here, -->
<!-- or they can be configured for a specific web app in a -->
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- contexts configuration (see $(jetty.base)/contexts/test.xml -->
<!-- for an example). -->
<!-- =========================================================== -->
<Ref id="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Arg><SystemProperty name="jetty.home" default="." />/../log/access_log.yyyy_mm_dd</Arg>
<Arg><SystemProperty name="jetty.base" default="." />/../log/access_log.yyyy_mm_dd</Arg>
<Set name="logDateFormat">dd/MMM/yyyy:HH:mm:ss Z</Set>
<Set name="retainDays">30</Set>
<Set name="append">true</Set>
Expand Down Expand Up @@ -834,7 +834,7 @@
</Set>
<Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><SystemProperty name="jetty.home" default="." />/../log/trace_log.yyyy_mm_dd</Arg>
<Arg type="String"><SystemProperty name="jetty.base" default="." />/../log/trace_log.yyyy_mm_dd</Arg>
<Arg type="boolean">true</Arg> <!-- append -->
<Arg type="int">10</Arg> <!-- retain days -->
</New>
Expand Down
42 changes: 21 additions & 21 deletions conf/jetty/jetty.xml.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
%%comment VAR:zimbraMailLocalBind,<!--%% HTTPLOCALEND -->

<New id="zimbraSslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><SystemProperty name="jetty.home" default="." />/etc/keystore</Set>
<Set name="KeyStorePath"><SystemProperty name="jetty.base" default="." />/etc/keystore</Set>
<Set name="KeyStorePassword">@@mailboxd_keystore_password@@</Set>
<Set name="KeyManagerPassword">@@mailboxd_keystore_password@@</Set>
<Set name="EndpointIdentificationAlgorithm"></Set>
Expand Down Expand Up @@ -187,7 +187,7 @@
<!-- user services connector, SSL with client certificate -->
<!-- HTTPSCLIENTCERTBEGIN %%uncomment VAR:zimbraMailSSLClientCertMode,-->,Disabled%%
<New id="zimbraSslClientContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><SystemProperty name="jetty.home" default="." />/etc/keystore</Set>
<Set name="KeyStorePath"><SystemProperty name="jetty.base" default="." />/etc/keystore</Set>
<Set name="KeyStorePassword">@@mailboxd_keystore_password@@</Set>
<Set name="KeyManagerPassword">@@mailboxd_keystore_password@@</Set>
<Set name="TrustStorePath">@@client_ssl_truststore@@</Set>
Expand Down Expand Up @@ -657,11 +657,11 @@
<!-- SERVICEWEBAPPBEGIN %%comment SERVICE:service,-->%%
<New id="service" class="org.eclipse.jetty.webapp.WebAppContext">
<Arg><Ref id="Contexts"/></Arg>
<Arg><SystemProperty name="jetty.home" default="."/>/webapps/service</Arg>
<Arg><SystemProperty name="jetty.base" default="."/>/webapps/service</Arg>
<Arg>/service</Arg>
<Set name="configurationClasses"><Ref id="plusConfig"/></Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="."/>/work/service</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="."/>/work/service</Set>
<Set name="compactPath">true</Set>
<Get name="errorHandler">
<Call name="setShowStacks">
Expand All @@ -678,11 +678,11 @@
<!-- ZIMBRAWEBAPPBEGIN %%comment SERVICE:zimbra,-->%%
<New id="zimbra" class="org.eclipse.jetty.webapp.WebAppContext">
<Arg><Ref id="Contexts"/></Arg>
<Arg><SystemProperty name="jetty.home" default="."/>/webapps/zimbra</Arg>
<Arg><SystemProperty name="jetty.base" default="."/>/webapps/zimbra</Arg>
<Arg>%%zimbraMailURL%%</Arg>
<Set name="configurationClasses"><Ref id="plusConfig"/></Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="."/>/work/zimbra</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="."/>/work/zimbra</Set>
<Set name="persistTempDirectory">true</Set>
<Set name="compactPath">true</Set>
<Set name="throwUnavailableOnStartupException">true</Set>
Expand All @@ -708,11 +708,11 @@
<!-- ZIMBRAADMINWEBAPPBEGIN %%comment SERVICE:zimbraAdmin,-->%%
<New id="zimbraAdmin" class="org.eclipse.jetty.webapp.WebAppContext">
<Arg><Ref id="Contexts"/></Arg>
<Arg><SystemProperty name="jetty.home" default="."/>/webapps/zimbraAdmin</Arg>
<Arg><SystemProperty name="jetty.base" default="."/>/webapps/zimbraAdmin</Arg>
<Arg>%%zimbraAdminURL%%</Arg>
<Set name="configurationClasses"><Ref id="plusConfig"/></Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="."/>/work/zimbraAdmin</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="."/>/work/zimbraAdmin</Set>
<Set name="compactPath">true</Set>
<Set name="throwUnavailableOnStartupException">true</Set>
<Get name="errorHandler">
Expand All @@ -736,19 +736,19 @@

<New id="zimlet" class="org.eclipse.jetty.webapp.WebAppContext">
<Arg><Ref id="Contexts"/></Arg>
<Arg><SystemProperty name="jetty.home" default="."/>/webapps/zimlet</Arg>
<Arg><SystemProperty name="jetty.base" default="."/>/webapps/zimlet</Arg>
<Arg>/zimlet</Arg>
<Set name="configurationClasses"><Ref id="plusConfig"/></Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.home" default="."/>/work/zimlet</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><SystemProperty name="jetty.base" default="."/>/work/zimlet</Set>
<Set name="compactPath">true</Set>
<Set name="throwUnavailableOnStartupException">true</Set>
<Set name="baseResource">
<New class="org.eclipse.jetty.util.resource.ResourceCollection">
<Arg>
<Array type="String">
<Item><SystemProperty name="jetty.home" default="."/>/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.home" default="."/>/../zimlets-deployed</Item>
<Item><SystemProperty name="jetty.base" default="."/>/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.base" default="."/>/../zimlets-deployed</Item>
</Array>
</Arg>
</New>
Expand Down Expand Up @@ -817,7 +817,7 @@
<!-- Configure Authentication Realms -->
<!-- Realms may be configured for the entire server here, or -->
<!-- they can be configured for a specific web app in a context -->
<!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
<!-- configuration (see $(jetty.base)/contexts/test.xml for an -->
<!-- example). -->
<!-- =========================================================== -->

Expand All @@ -826,7 +826,7 @@
<Arg>
<New class="org.eclipse.jetty.security.SpnegoLoginService">
<Set name="name">Spnego Authentication Realm</Set>
<Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/spnego.properties</Set>
<Set name="config"><SystemProperty name="jetty.base" default="."/>/etc/spnego.properties</Set>
<Set name="IdentityService">
<New class="org.eclipse.jetty.security.DefaultIdentityService"/>
</Set>
Expand Down Expand Up @@ -857,13 +857,13 @@
<!-- Configure Request Log -->
<!-- Request logs may be configured for the entire server here, -->
<!-- or they can be configured for a specific web app in a -->
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- contexts configuration (see $(jetty.base)/contexts/test.xml -->
<!-- for an example). -->
<!-- =========================================================== -->
<Ref id="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Arg><SystemProperty name="jetty.home" default="."/>/../log/access_log.yyyy_mm_dd</Arg>
<Arg><SystemProperty name="jetty.base" default="."/>/../log/access_log.yyyy_mm_dd</Arg>
<Set name="logDateFormat">dd/MMM/yyyy:HH:mm:ss Z</Set>
<Set name="retainDays">30</Set>
<Set name="append">true</Set>
Expand Down Expand Up @@ -906,7 +906,7 @@
<Set name="handler"><Ref id="oldhandler"/></Set>
<Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><SystemProperty name="jetty.home" default="."/>/../log/trace_log.yyyy_mm_dd</Arg>
<Arg type="String"><SystemProperty name="jetty.base" default="."/>/../log/trace_log.yyyy_mm_dd</Arg>
<Arg type="boolean">true</Arg>
<Arg type="int">10</Arg>
</New>
Expand Down
4 changes: 2 additions & 2 deletions conf/jetty/jettyrc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
JAVA_OPTIONS="-DSTART=${JETTY_HOME}/etc/start.config -DSTOP.PORT=7867 -DSTOP.KEY=stop -Dzimbra.config=/opt/zimbra/conf/localconfig.xml -Djava.library.path=/opt/zimbra/lib -Djava.endorsed.dirs=${JETTY_HOME}/common/endorsed"
JAVA_OPTIONS="-DSTART=${JETTY_BASE}/etc/start.config -DSTOP.PORT=7867 -DSTOP.KEY=stop -Dzimbra.config=/opt/zimbra/conf/localconfig.xml -Djava.library.path=/opt/zimbra/lib -Djava.endorsed.dirs=${JETTY_BASE}/common/endorsed -Djetty.home=${JETTY_HOME} -Djetty.base=${JETTY_BASE}"
JETTY_CONSOLE=/opt/zimbra/log/jetty.out
JETTY_RUN=/opt/zimbra/log
JETTY_ARGS=" --module=zimbra,server,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,monitor,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_HOME}"
JETTY_ARGS=" --module=zimbra,server,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,monitor,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_BASE}"
CONFIGS="etc/jetty.xml"
4 changes: 2 additions & 2 deletions conf/jetty/zimbra.policy.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ grant {
permission javax.net.ssl.SSLPermission "*";

//Jetty internals
permission java.io.FilePermission "${jetty.home}/-", "read";
permission java.io.FilePermission "${jetty.home}/work/-", "read,write,delete";
permission java.io.FilePermission "${jetty.base}/-", "read";
permission java.io.FilePermission "${jetty.base}/work/-", "read,write,delete";
permission java.io.FilePermission "etc/-", "read";
permission java.io.FilePermission "null", "read";

Expand Down

0 comments on commit 838558a

Please sign in to comment.