steve
/
geoserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge errors 

add config in server-https.xml
pull/47/head
Chris Barnett 2024-07-08 21:20:52 -04:00
parent 31aa91735c
commit 91846716a3
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -101,10 +101,6 @@ ENV CONFIG_DIR=/opt/config
ENV CONFIG_OVERRIDES_DIR=/opt/config_overrides ENV CONFIG_OVERRIDES_DIR=/opt/config_overrides
ENV WEBAPP_CONTEXT=geoserver ENV WEBAPP_CONTEXT=geoserver
ENV HEALTHCHECK_URL='' ENV HEALTHCHECK_URL=''
ENV HTTPS_ENABLED=false
ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
ENV HTTPS_KEYSTORE_PASSWORD=changeit
ENV HTTPS_KEY_ALIAS=server
ENV HTTPS_ENABLED=false ENV HTTPS_ENABLED=false
ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
@ -157,9 +153,6 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
# See also CIS Docker benchmark and docker best practices # See also CIS Docker benchmark and docker best practices
RUN chmod +x /opt/*.sh && sed -i 's/\r$//' /opt/startup.sh RUN chmod +x /opt/*.sh && sed -i 's/\r$//' /opt/startup.sh
ENV WEBAPP_CONTEXT=geoserver
ENV HEALTHCHECK_URL=''
ENTRYPOINT ["bash", "/opt/startup.sh"] ENTRYPOINT ["bash", "/opt/startup.sh"]
WORKDIR /opt WORKDIR /opt

23
config/server-https.xml
View File

@ -160,7 +160,7 @@
</Realm> </Realm>
<Host name="localhost" appBase="webapps" <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true"> unpackWARs="true" autoDeploy="false" deployOnStartup="false">
<!-- SingleSignOn valve, share authentication between web applications <!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html --> Documentation at: /docs/config/valve.html -->
@ -174,7 +174,26 @@
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt" prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" /> pattern="%h %l %u %t &quot;%r&quot; %s %b" />
<Context antiResourceLocking="false" override="true" docBase="geoserver" privileged="true" path="${WEBAPP_CONTEXT}">
<Resource name="${POSTGRES_JNDI_RESOURCE_NAME}"
auth="Container"
type="javax.sql.DataSource"
driverClassName="org.postgresql.Driver"
url="jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
username="${POSTGRES_USERNAME}"
password="${POSTGRES_PASSWORD}"
maxTotal="25"
initialSize="0"
minIdle="0"
maxIdle="8"
maxWaitMillis="-1"
timeBetweenEvictionRunsMillis="30000"
minEvictableIdleTimeMillis="60000"
testWhileIdle="true"
validationQuery="SELECT 1"
rollbackOnReturn="true"
/>
</Context>
</Host> </Host>
</Engine> </Engine>
</Service> </Service>