This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch remove-default-jre-headless in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit bace0fe6e9cb77714731bdd209a2c4dd18b2e827 Author: Robert Newson <rnew...@apache.org> AuthorDate: Wed Sep 18 09:43:40 2024 +0100 set JAVA_PATH in /etc/default/couchdb-nouveau The previous approach, cribbed from apacheds upstream package, forced an install of an undesired JRE. --- debian/control.in | 2 +- debian/couchdb-nouveau.default | 2 +- debian/couchdb-nouveau.service | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control.in b/debian/control.in index 5008d9c..5b219df 100644 --- a/debian/control.in +++ b/debian/control.in @@ -62,7 +62,7 @@ Package: couchdb-nouveau Architecture: any Depends: adduser, debconf, - default-jre-headless, java11-runtime-headless | java11-runtime, + java11-runtime-headless | java11-runtime, init-system-helpers, lsb-base, procps, diff --git a/debian/couchdb-nouveau.default b/debian/couchdb-nouveau.default index 8b62d3b..084b62c 100644 --- a/debian/couchdb-nouveau.default +++ b/debian/couchdb-nouveau.default @@ -12,5 +12,5 @@ # Java options -JAVA_HOME=/usr/lib/jvm/default-java +JAVA_PATH=/usr/bin/java JAVA_OPTS="-server -Djava.awt.headless=true -Xmx2g" diff --git a/debian/couchdb-nouveau.service b/debian/couchdb-nouveau.service index efa4dbf..1db707d 100644 --- a/debian/couchdb-nouveau.service +++ b/debian/couchdb-nouveau.service @@ -10,7 +10,7 @@ WorkingDirectory=/opt/nouveau EnvironmentFile=/etc/default/couchdb-nouveau # Lifecycle -ExecStart=/bin/sh -c "exec ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar /opt/nouveau/lib/nouveau-*.jar server /opt/nouveau/etc/nouveau.yaml" +ExecStart=/bin/sh -c "exec ${JAVA_PATH} ${JAVA_OPTS} -jar /opt/nouveau/lib/nouveau-*.jar server /opt/nouveau/etc/nouveau.yaml" SuccessExitStatus=143 LimitNOFILE=infinity Restart=on-failure