Skip to content

Commit

Permalink
ZBUG-2991:use cwd of jetty process path for zimlets-deployed directory
Browse files Browse the repository at this point in the history
  • Loading branch information
@umagmrit
umagmrit committed Oct 20, 2022
1 parent 44cbb23 commit f9f30f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions conf/jetty/jetty.xml.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,8 +827,8 @@
<New class="org.eclipse.jetty.util.resource.ResourceCollection">
<Arg>
<Array type="String">
<Item><SystemProperty name="jetty.zimlet.base" default="."/>/webapps/zimlet</Item>
<Item><SystemProperty name="jetty.zimlet.base" default="."/>/../zimlets-deployed</Item>
<Item><SystemProperty name="jetty.base" default="."/>/webapps/zimlet</Item>
<Item>./../zimlets-deployed</Item>
</Array>
</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_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}"
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,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}"
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}"
CONFIGS="etc/jetty.xml"

1 comment on commit f9f30f6

@xes
Copy link

@xes xes commented on f9f30f6 Dec 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which is supposed to be "cwd jetty process path" ?

"Maybe" that jetty process is not running inside /opt/zimbra/jetty, but in fact is running inside /opt/zimbra/log
Could you check it?

If /opt/zimbra/log is a symbolic link to a log folder in a different volume, this commit breaks all zimlets loading.

Please sign in to comment.