commit: 43154d0fb4ddd6bb9242b1f4d5b40dce1f94a312 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Jan 14 07:52:29 2023 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Jan 14 07:53:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43154d0f
dev-util/jenkins-bin: make startup corrections to correct file A new service file was created but the changes were applied to the old file. Closes: https://bugs.gentoo.org/890710 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-util/jenkins-bin/files/jenkins-bin-r3.service | 2 +- dev-util/jenkins-bin/files/jenkins-bin-r4.service | 2 +- dev-util/jenkins-bin/jenkins-bin-2.375.2-r1.ebuild | 45 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service index dfe0d174f365..520a052f43f1 100644 --- a/dev-util/jenkins-bin/files/jenkins-bin-r3.service +++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.service @@ -4,7 +4,7 @@ Description=Jenkins Daemon [Service] EnvironmentFile=/etc/conf.d/jenkins Type=simple -ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS} +ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS} User=jenkins [Install] diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r4.service b/dev-util/jenkins-bin/files/jenkins-bin-r4.service index 520a052f43f1..dfe0d174f365 100644 --- a/dev-util/jenkins-bin/files/jenkins-bin-r4.service +++ b/dev-util/jenkins-bin/files/jenkins-bin-r4.service @@ -4,7 +4,7 @@ Description=Jenkins Daemon [Service] EnvironmentFile=/etc/conf.d/jenkins Type=simple -ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS} +ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS} User=jenkins [Install] diff --git a/dev-util/jenkins-bin/jenkins-bin-2.375.2-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.375.2-r1.ebuild new file mode 100644 index 000000000000..43828c85c5e8 --- /dev/null +++ b/dev-util/jenkins-bin/jenkins-bin-2.375.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="Extensible continuous integration server" +HOMEPAGE="https://jenkins.io/"; +LICENSE="MIT" +SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war" +SLOT="lts" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux" +IUSE="" + +DEPEND="acct-group/jenkins + acct-user/jenkins" + +RDEPEND="acct-group/jenkins + acct-user/jenkins + media-fonts/dejavu + media-libs/freetype + !dev-util/jenkins-bin:0 + || ( virtual/jre:17 virtual/jre:11 )" + +S="${WORKDIR}" + +src_install() { + local JENKINS_DIR=/var/lib/jenkins + + keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home + + insinto /opt/jenkins + newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/} + + newinitd "${FILESDIR}"/${PN}-r3.init jenkins + newconfd "${FILESDIR}"/${PN}-r1.confd jenkins + + systemd_newunit "${FILESDIR}"/${PN}-r4.service jenkins.service + + fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup +}
