public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/
@ 2023-01-14  7:53 Hans de Graaff
  0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-01-14  7:53 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/
@ 2023-07-15 18:25 Hans de Graaff
  0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-07-15 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     e6a81a66efc3b3150375e11cfc1e206db01cae91
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:24:06 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:24:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a81a66

dev-util/jenkins-bin: fix systemd service file

The --daemon option is no longer available with Jenkins.

Closes: https://bugs.gentoo.org/904101
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-util/jenkins-bin/Manifest                      |  1 +
 dev-util/jenkins-bin/files/jenkins-bin-r5.service  | 11 ++++++
 dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild | 45 ++++++++++++++++++++++
 dev-util/jenkins-bin/jenkins-bin-2.414.ebuild      | 45 ++++++++++++++++++++++
 4 files changed, 102 insertions(+)

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 89cb0df079f8..c79d9acbdbac 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,3 +1,4 @@
 DIST jenkins-bin-2.401.1.war 98362423 BLAKE2B b1c3853b463a4003ff5d40dc5299ce2ea717fc018adf4b80a241ba6912b3642ebb334681a08b7cb8b7088d3abe37775ed1e3d51feefc5953ce68be15c4482648 SHA512 6150e9b871ba2b0b1366751e9ef3c67a50e129ec091fea3c336325cc1a5c15b1182a3c71ea3092de1ec85e035e0edb97de9c2801654c8e116501cc6f3f7eb077
 DIST jenkins-bin-2.401.2.war 98406337 BLAKE2B 58f5b2ddc8883816423f577c1a10f5de256b34d40f7b71d78f1948330187ee76dff02c2afa7754b677a578639e81a0d0af4d7b1210b13f3138bc8467c9c448d0 SHA512 82029df261d823556616198a1f8e9371ef991abf9d6ac08d5582b7c1b97a52c4fd3220012d22b0720c297520fb7083b22e14cda2797e17e23de3d359e6d025b4
 DIST jenkins-bin-2.410.war 93652415 BLAKE2B df4bf3939fd785e963b59e2cb6e434e2f89a78c3c3e36001189c9eb6f1a74c6c722a68835e189535f669977cd911f24819e9a015028c51bf6e94b7c6c55f0735 SHA512 61d69190b7fcc28fadbec678f3e0d815e6e5809f7dfdaf3ddff80573589a67d8b84b5487b35a5af16e444bf4876708d3f3e4d254b1432c2e1359ec8f76d2029c
+DIST jenkins-bin-2.414.war 89528534 BLAKE2B c97c854504dcf04bc0ccdb45efd6b348e13523ed8ef4486b8acabca3fa8bab234dd327261053306c2679be5a2bfef918203ad1615e0188d2d5178c95e003cce0 SHA512 3b64155df9f14f791b3129ebb4d95989513bafb54df379a952cb6ff980c833756a15d34457724fa9f1534205cf1b24d1ad1087d2522198f4f98d5a6ddd93dec6

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r5.service b/dev-util/jenkins-bin/files/jenkins-bin-r5.service
new file mode 100644
index 000000000000..e92f1d0a19f7
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r5.service
@@ -0,0 +1,11 @@
+[Unit]
+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} --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]
+WantedBy=multi-user.target

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild
new file mode 100644
index 000000000000..e8b333002f60
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.401.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="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="https://get.jenkins.io/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}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.414.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.414.ebuild
new file mode 100644
index 000000000000..94f16b3ed823
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.414.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="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+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:lts
+	|| ( 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}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/
@ 2022-07-29  7:01 Hans de Graaff
  0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2022-07-29  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     dbcc867d821a6ccd39ff7be74cc595daf990b390
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 06:59:41 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 07:01:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcc867d

dev-util/jenkins-bin: add 2.361

Bug: https://bugs.gentoo.org/828651
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-util/jenkins-bin/Manifest                     |  1 +
 dev-util/jenkins-bin/files/jenkins-bin-r3.service | 11 ++++++
 dev-util/jenkins-bin/jenkins-bin-2.361.ebuild     | 45 +++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index b03c001a6330..092d0a8c8616 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,3 +2,4 @@ DIST jenkins-bin-2.332.4.war 94930441 BLAKE2B 9502d7fd91d0ffc6871ff0613061883bef
 DIST jenkins-bin-2.346.1.war 91193351 BLAKE2B 21a0f2ec258498e447a25527e82ad6e7e0b061daaa9647f244930471629de4805755648f6a689598e048e3ffa72879d1dba88a7a4d5ce3fe5bff287f6cd395ca SHA512 63a34dcf66714b6db405a46ca6677693458f49cb61ff413c8c4bcffe6e10eff33ead5dc2e4f3eb3560980c33f1dbd67c3f51655d578ce5cbb19e1ddf871aa545
 DIST jenkins-bin-2.346.2.war 91198171 BLAKE2B 074bd7004d6244233da563c3d64626d0532f76b802ebd9056230cbbbef3381503b80daf4bfa0ec8866c3fcf9596cb0f8b53fe725f340452b755b092334437b5a SHA512 c1f579a667cabd1de00bb5b6db82c60b2089a82126ea07efe7bb1c987fff96f1e05bc20c28abc97c7e05be158df59968ac4ed330e8459bc438e3e7169d84a5dc
 DIST jenkins-bin-2.356.war 90781388 BLAKE2B d65e1642a118cfcad66c4585bfe4e30cea8a5e8b598a6ba33b298a158fb2901d0b388aec9087d243648f51067661cccfb610948129f35c40c5c5bba4d3fb89e0 SHA512 2b602cac61101e4f47a23727b682684cec6afac7a867606f5210f5213a78ced0d0b1a2bf10507c26c58e480217a59b906626c80d133504f8d195a6e9e8fed94c
+DIST jenkins-bin-2.361.war 93448807 BLAKE2B 610a29beedb8daa6be624a37a934863857886ac312c3f1b858a83791942bbecc7c34da7e17ac17acf8f67263e8b8466e1d4912f528b29aeafd3b1822748bcff1 SHA512 93cd057b00142df516a5dea61da4cf1bb9b8b682d282528be962689b03a834426611c6547bbcd44fa9a4b7a9296e036c5966c22d791021b311ef6a43692f14fb

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
new file mode 100644
index 000000000000..520a052f43f1
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
@@ -0,0 +1,11 @@
+[Unit]
+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}
+User=jenkins
+
+[Install]
+WantedBy=multi-user.target

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.361.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.361.ebuild
new file mode 100644
index 000000000000..593c0b96ef08
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.361.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 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/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+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:lts
+	|| ( 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}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r3.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/
@ 2021-06-17 13:33 Thomas Deutschmann
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2021-06-17 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     0381eb23425a2caaffdb2961cc49d4b12a92326d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 13:29:26 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 13:32:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0381eb23

dev-util/jenkins-bin: fix logrotate script

Closes: https://bugs.gentoo.org/795177
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/{jenkins-bin-r1.logrotate => jenkins-bin-r2.logrotate}        | 2 +-
 .../{jenkins-bin-2.289.1.ebuild => jenkins-bin-2.289.1-r1.ebuild}       | 2 +-
 .../{jenkins-bin-2.297.ebuild => jenkins-bin-2.297-r1.ebuild}           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate
similarity index 96%
rename from dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
rename to dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate
index 33b16600452..895461f0540 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate
@@ -3,7 +3,7 @@
     dateext
     maxage 365
     rotate 99
-    size=+4096k
+    size 4M
     notifempty
     missingok
     create 644

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild
similarity index 95%
rename from dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild
index 10778d0c4f4..4f917fe82da 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
 
 	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.297.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild
similarity index 95%
rename from dev-util/jenkins-bin/jenkins-bin-2.297.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild
index 6272140cb58..af8ebb51388 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.297.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
 
 	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/
@ 2018-12-11 10:33 Hans de Graaff
  0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2018-12-11 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     6bb8646ba90649df00938a7919b985364558760e
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 10:32:36 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 10:32:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb8646b

dev-util/jenkins-bin: use jenkins.conf also for systemd

Use the options specified in /etc/conf.d/jenkins.conf also
for the systemd service, rather than hardcoding specific values.

Thanks to Georg Voigtländer for providing the updated service file.

Bug: https://bugs.gentoo.org/665030
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-util/jenkins-bin/files/jenkins-bin.service2    | 11 ++++++
 dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild | 46 ++++++++++++++++++++++
 dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild   | 46 ++++++++++++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service2 b/dev-util/jenkins-bin/files/jenkins-bin.service2
new file mode 100644
index 00000000000..f109fac02cc
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.service2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Jenkins Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/jenkins
+Type=forking
+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]
+WantedBy=multi-user.target

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild
new file mode 100644
index 00000000000..c8cffcf979a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user 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"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	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}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild
new file mode 100644
index 00000000000..95c4fb75944
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	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}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-07-15 18:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-14  7:53 [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/, dev-util/jenkins-bin/files/ Hans de Graaff
  -- strict thread matches above, loose matches on Subject: below --
2023-07-15 18:25 Hans de Graaff
2022-07-29  7:01 Hans de Graaff
2021-06-17 13:33 Thomas Deutschmann
2018-12-11 10:33 Hans de Graaff

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox