From f8f71fcb1ff9d4074a7933358fdb50c283e45a0c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 7 Jun 2020 17:04:46 +0200 Subject: [PATCH 1/2] pickup system property to configure jetty host --- scm-packaging/deb/src/main/fs/etc/scm/server-config.xml | 6 +++++- scm-packaging/docker/src/main/fs/etc/scm/server-config.xml | 6 +++++- scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml | 6 +++++- scm-packaging/unix/src/main/fs/conf/server-config.xml | 6 +++++- scm-packaging/windows/src/main/fs/conf/server-config.xml | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml index b7a5a7efef..89f9d56ca4 100644 --- a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml +++ b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml @@ -57,6 +57,9 @@ + + + @@ -67,7 +70,8 @@ /scm - /var/webapp/scm-webapp.war + /var/webapp/scm-webapp.war + org.eclipse.jetty.servlet.Default.dirAllowed diff --git a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml index b7a5a7efef..89f9d56ca4 100644 --- a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml +++ b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml @@ -57,6 +57,9 @@ + + + @@ -67,7 +70,8 @@ /scm - /var/webapp/scm-webapp.war + /var/webapp/scm-webapp.war + org.eclipse.jetty.servlet.Default.dirAllowed diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml index b7a5a7efef..89f9d56ca4 100644 --- a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml +++ b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml @@ -57,6 +57,9 @@ + + + @@ -67,7 +70,8 @@ /scm - /var/webapp/scm-webapp.war + /var/webapp/scm-webapp.war + org.eclipse.jetty.servlet.Default.dirAllowed diff --git a/scm-packaging/unix/src/main/fs/conf/server-config.xml b/scm-packaging/unix/src/main/fs/conf/server-config.xml index 46ab3eb514..08814ccf68 100644 --- a/scm-packaging/unix/src/main/fs/conf/server-config.xml +++ b/scm-packaging/unix/src/main/fs/conf/server-config.xml @@ -57,6 +57,9 @@ + + + @@ -67,7 +70,8 @@ /scm - /var/webapp/scm-webapp.war + /var/webapp/scm-webapp.war + org.eclipse.jetty.servlet.Default.dirAllowed diff --git a/scm-packaging/windows/src/main/fs/conf/server-config.xml b/scm-packaging/windows/src/main/fs/conf/server-config.xml index b7a5a7efef..89f9d56ca4 100644 --- a/scm-packaging/windows/src/main/fs/conf/server-config.xml +++ b/scm-packaging/windows/src/main/fs/conf/server-config.xml @@ -57,6 +57,9 @@ + + + @@ -67,7 +70,8 @@ /scm - /var/webapp/scm-webapp.war + /var/webapp/scm-webapp.war + org.eclipse.jetty.servlet.Default.dirAllowed From 9fcfafbdbd169bcefd988f1e9cb18109f63207e2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 7 Jun 2020 17:09:02 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ad6672d84..9b9236809f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed +- Fixes configuration of jetty listener address with system property `jetty.host` ([#1173](https://github.com/scm-manager/scm-manager/pull/1173), [#1174](https://github.com/scm-manager/scm-manager/pull/1174)) + ## [2.0.0] - 2020-06-04 ### Added - Detect renamed files in git and hg diffs ([#1157](https://github.com/scm-manager/scm-manager/pull/1157))