allow overriding host

This commit is contained in:
nora 2023-09-05 18:27:17 +02:00
parent 6445bf50eb
commit f14446803f
5 changed files with 8 additions and 5 deletions

View file

@ -51,6 +51,7 @@ ENV JRE_HOME /home/openolat/jre
ENV DB_PASSWORD default
ENV DB_URL jdbc:postgresql://localhost:5432/oodb
ENV OLAT_HOST localhost
RUN mkdir -p /home/openolat/conf/Catalina/localhost/
COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml

View file

@ -6,3 +6,4 @@ https://docs.openolat.org/manual_admin/installation/installGuide/
- `DB_PASSWORD`, default `default`
- `DB_URL`, default `jdbc:postgresql://localhost:5432/oodb`
- `OLAT_HOST`, default `localhost`

View file

@ -3,7 +3,8 @@
set -euo pipefail
sed -i -e s/__PASSWORD__/${DB_PASSWORD}/ /home/openolat/conf/Catalina/localhost/ROOT.xml
sed -i -e s#__DB_URL__#${DB_URL}# /home/openolat/conf/Catalina/localhost/ROOT.xml
sed -i -e "s/__PASSWORD__/${DB_PASSWORD}/ /home/openolat/conf/Catalina/localhost/ROOT.xml"
sed -i -e "s#__DB_URL__#${DB_URL}# /home/openolat/conf/Catalina/localhost/ROOT.xml"
sed -i -e "s#__HOST__#${OLAT_HOST}# /home/openolat/conf/server.xml"
exec /home/openolat/tomcat/bin/catalina.sh run

View file

@ -2,8 +2,8 @@
<Server port="8085" shutdown="SHUTDOWN">
<Service name="Catalina">
<Connector port="8088" protocol="HTTP/1.1" />
<Engine name="Catalina" defaultHost="localhost">
<Host name="localhost" appBase="webapps" />
<Engine name="Catalina" defaultHost="__HOST__">
<Host name="__HOST__" appBase="webapps" />
</Engine>
</Service>
</Server>