Skip to content

Commit

Permalink
Merge branch 'release/10.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@umagmrit
umagmrit committed Sep 20, 2022
2 parents 82bf2b1 + 2ff8a2b commit d6957d4
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 27 deletions.
3 changes: 3 additions & 0 deletions conf/jetty/jetty-logging.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Configure Jetty for STDERR (System.err)
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
org.eclipse.jetty.LEVEL=INFO
6 changes: 6 additions & 0 deletions conf/jetty/jetty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,12 @@
<Item>POST</Item>
</Array>
</Set>
<!-- Modern UI uses build time compression -->
<Set name="excludedPaths">
<Array type="String">
<Item>/modern/*</Item>
</Array>
</Set>
</New>
</Set>

Expand Down
48 changes: 44 additions & 4 deletions conf/jetty/jetty.xml.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<Arg>
<New class="org.eclipse.jetty.server.ForwardedRequestCustomizer">
<Set name="forwardedForHeader">bogus</Set>
<Set name="forwardedPortAsAuthority">false</Set>
</New>
</Arg>
</Call>
Expand Down Expand Up @@ -121,7 +122,7 @@
</Call>
%%comment VAR:zimbraMailLocalBind,<!--%% HTTPLOCALEND -->

<New id="zimbraSslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<New id="zimbraSslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
<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>
Expand Down Expand Up @@ -186,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">
<New id="zimbraSslClientContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Client">
<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>
Expand Down Expand Up @@ -304,6 +305,38 @@
</Arg>
</Call>

<Call id="docServerHttpsConnector" name="addConnector">
<Arg>
<New id="docServer" class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server">
<Ref refid="Server" />
</Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item>
<New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">http/1.1</Arg>
<Arg name="sslContextFactory">
<Ref refid="zimbraSslContextFactory" />
</Arg>
</New>
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config">
<Ref refid="sslHttpConfig" />
</Arg>
</New>
</Item>
</Array>
</Arg>
<Set name="host"></Set>
<Set name="port">%%zimbraDocumentEditingCallbackPort%%</Set>
<Set name="idleTimeout">60000</Set>
</New>
</Arg>
</Call>

<!-- ADMINLOCALBEGIN %%comment VAR:zimbraAdminLocalBind,-->%%
<Call id="adminLocalConnector" name="addConnector">
<Arg>
Expand Down Expand Up @@ -794,8 +827,8 @@
<New class="org.eclipse.jetty.util.resource.ResourceCollection">
<Arg>
<Array type="String">
<Item><SystemProperty name="jetty.base" default="."/>/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.base" default="."/>/../zimlets-deployed</Item>
<Item><SystemProperty name="jetty.zimlet.base" default="."/>/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.zimlet.base" default="."/>/../zimlets-deployed</Item>
</Array>
</Arg>
</New>
Expand Down Expand Up @@ -939,6 +972,13 @@
<Item>POST</Item>
</Array>
</Set>

<!-- Modern UI uses build time compression -->
<Set name="excludedPaths">
<Array type="String">
<Item>/modern/*</Item>
</Array>
</Set>
</New>
</Set>
%%comment VAR:zimbraHttpCompressionEnabled,<!--%% HTTPCOMPRESSIONEND -->
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_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}"
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} -Djetty.zimlet.base=${JETTY_ZIMLET_BASE}"
JETTY_CONSOLE=/opt/zimbra/log/jetty.out
JETTY_RUN=/opt/zimbra/log
JETTY_ARGS=" --module=zimbra,server,mail,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_BASE}"
JETTY_ARGS=" --module=zimbra,server,mail,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_BASE} jetty.zimlet.base=${JETTY_ZIMLET_BASE}"
CONFIGS="etc/jetty.xml"
12 changes: 6 additions & 6 deletions conf/jetty/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This file is used for jetty logging before service webapp is loaded when
# log4j switches to the log4j.properties file in /opt/zimbra/conf.

log4j.threshhold=OFF
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %-4r %-5p [%t] %c{1} - %m%n

log4j.rootLogger=INFO,CONSOLE
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

# CONSOLE is set to be a ConsoleAppender which outputs to System.out.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p [%t] %c{1} - %m%n
13 changes: 7 additions & 6 deletions conf/jetty/log4j.properties.production
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# This file is used for jetty logging before service webapp is loaded when
# log4j switches to the log4j.properties file in /opt/zimbra/conf.
# CONSOLE is set to be a ConsoleAppender which outputs to System.out

log4j.threshhold=OFF
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %-4r %-5p [%t] %c{1} - %m%n

log4j.rootLogger=INFO,CONSOLE
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

# CONSOLE is set to be a ConsoleAppender which outputs to System.out.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p [%t] %c{1} - %m%n
2 changes: 1 addition & 1 deletion conf/jetty/modules/setuid.mod.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
server

[lib]
lib/setuid/jetty-setuid-java-1.0.3.jar
lib/setuid/jetty-setuid-java-1.0.4.jar

[xml]
etc/jetty-setuid.xml
Expand Down
46 changes: 42 additions & 4 deletions conf/jetty/webdefault.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,53 @@
<!-- -->
<!-- dirAllowed If true, directory listings are returned if no -->
<!-- welcome file is found. Else 403 Forbidden. -->
<!-- welcomeServlets If true, attempt to dispatch to welcome files -->
<!-- that are servlets, but only after no matching -->
<!-- static resources could be found. If false, -->
<!-- then a welcome file must exist on disk. -->
<!-- If "exact", then exact servlet matches -->
<!-- are supported without an existing file. -->
<!-- Default is false. -->
<!-- -->
<!-- This must be false if you want directory listings,-->
<!-- but have index.jsp in your welcome file list. -->
<!-- -->
<!-- redirectWelcome If true, redirect welcome file requests -->
<!-- else use request dispatcher forwards -->
<!-- -->
<!-- gzip If set to true, then static content will be served-->
<!-- as gzip content encoded if a matching resource is -->
<!-- found ending with ".gz" -->
<!-- gzip If set to true, then static content will be served as -->
<!-- gzip content encoded if a matching resource is -->
<!-- found ending with ".gz" (default false) -->
<!-- (deprecated: use precompressed) -->
<!-- -->
<!-- precompressed If set to a comma separated list of encoding types-->
<!-- (that may be listed in a requests Accept-Encoding -->
<!-- header) to file extension mappings to look for -->
<!-- and serve. For example: "br=.br,gzip=.gz,bzip2=.bz". -->
<!-- If set to a boolean True, then a default set of -->
<!-- compressed formats will be used, otherwise -->
<!-- no precompressed formats. -->
<!-- -->
<!-- resoureBase Can be set to replace the context resource base -->
<!-- -->
<!-- resourceCache If set, this is a context attribute name, -->
<!-- which the servlet will use to look for a shared -->
<!-- ResourceCache instance. -->
<!-- -->
<!-- relativeResourceBase -->
<!-- Set with a pathname relative to the base of the -->
<!-- servlet context root. Useful for only serving -->
<!-- static content from only specific subdirectories. -->
<!-- -->
<!-- pathInfoOnly If true, only the path info will be applied -->
<!-- to the resourceBase -->
<!-- -->
<!-- stylesheet Set with the location of an optional stylesheet -->
<!-- that will be used to decorate the directory -->
<!-- listing html. -->
<!-- -->
<!-- etags If True, weak etags will be generated and handled.-->
<!-- -->
<!-- useFileMappedBuffer -->
<!-- If set to true (the default), a memory mapped -->
<!-- file buffer will be used to serve static content -->
Expand All @@ -97,6 +129,12 @@
<!-- of resource cache. A bio cached buffer may be used-->
<!-- by nio but is not as efficient as a nio buffer. -->
<!-- An nio cached buffer may not be used by bio. -->
<!-- otherGzipFileExtensions -->
<!-- Other file extensions that signify that a file is -->
<!-- already compressed. Eg ".svgz" -->
<!-- -->
<!-- encodingHeaderCacheSize -->
<!-- Max entries in a cache of ACCEPT-ENCODING headers.-->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet>
Expand Down Expand Up @@ -131,7 +169,7 @@
<param-value>both</param-value>
</init-param>
<init-param>
<param-name>gzip</param-name>
<param-name>precompressed</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
Expand Down
46 changes: 42 additions & 4 deletions conf/jetty/webdefault.xml.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,53 @@
<!-- -->
<!-- dirAllowed If true, directory listings are returned if no -->
<!-- welcome file is found. Else 403 Forbidden. -->
<!-- welcomeServlets If true, attempt to dispatch to welcome files -->
<!-- that are servlets, but only after no matching -->
<!-- static resources could be found. If false, -->
<!-- then a welcome file must exist on disk. -->
<!-- If "exact", then exact servlet matches -->
<!-- are supported without an existing file. -->
<!-- Default is false. -->
<!-- -->
<!-- This must be false if you want directory listings,-->
<!-- but have index.jsp in your welcome file list. -->
<!-- -->
<!-- redirectWelcome If true, redirect welcome file requests -->
<!-- else use request dispatcher forwards -->
<!-- -->
<!-- gzip If set to true, then static content will be served-->
<!-- as gzip content encoded if a matching resource is -->
<!-- found ending with ".gz" -->
<!-- gzip If set to true, then static content will be served as -->
<!-- gzip content encoded if a matching resource is -->
<!-- found ending with ".gz" (default false) -->
<!-- (deprecated: use precompressed) -->
<!-- -->
<!-- precompressed If set to a comma separated list of encoding types-->
<!-- (that may be listed in a requests Accept-Encoding -->
<!-- header) to file extension mappings to look for -->
<!-- and serve. For example: "br=.br,gzip=.gz,bzip2=.bz". -->
<!-- If set to a boolean True, then a default set of -->
<!-- compressed formats will be used, otherwise -->
<!-- no precompressed formats. -->
<!-- -->
<!-- resoureBase Can be set to replace the context resource base -->
<!-- -->
<!-- resourceCache If set, this is a context attribute name, -->
<!-- which the servlet will use to look for a shared -->
<!-- ResourceCache instance. -->
<!-- -->
<!-- relativeResourceBase -->
<!-- Set with a pathname relative to the base of the -->
<!-- servlet context root. Useful for only serving -->
<!-- static content from only specific subdirectories. -->
<!-- -->
<!-- pathInfoOnly If true, only the path info will be applied -->
<!-- to the resourceBase -->
<!-- -->
<!-- stylesheet Set with the location of an optional stylesheet -->
<!-- that will be used to decorate the directory -->
<!-- listing html. -->
<!-- -->
<!-- etags If True, weak etags will be generated and handled.-->
<!-- -->
<!-- useFileMappedBuffer -->
<!-- If set to true (the default), a memory mapped -->
<!-- file buffer will be used to serve static content -->
Expand All @@ -104,6 +136,12 @@
<!-- of resource cache. A bio cached buffer may be used-->
<!-- by nio but is not as efficient as a nio buffer. -->
<!-- An nio cached buffer may not be used by bio. -->
<!-- otherGzipFileExtensions -->
<!-- Other file extensions that signify that a file is -->
<!-- already compressed. Eg ".svgz" -->
<!-- -->
<!-- encodingHeaderCacheSize -->
<!-- Max entries in a cache of ACCEPT-ENCODING headers.-->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet>
Expand Down Expand Up @@ -138,7 +176,7 @@
<param-value>both</param-value>
</init-param>
<init-param>
<param-name>gzip</param-name>
<param-name>precompressed</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
Expand Down

0 comments on commit d6957d4

Please sign in to comment.