1 |
commit: 6bb8646ba90649df00938a7919b985364558760e |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 11 10:32:36 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 11 10:32:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb8646b |
7 |
|
8 |
dev-util/jenkins-bin: use jenkins.conf also for systemd |
9 |
|
10 |
Use the options specified in /etc/conf.d/jenkins.conf also |
11 |
for the systemd service, rather than hardcoding specific values. |
12 |
|
13 |
Thanks to Georg Voigtländer for providing the updated service file. |
14 |
|
15 |
Bug: https://bugs.gentoo.org/665030 |
16 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
17 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
18 |
|
19 |
dev-util/jenkins-bin/files/jenkins-bin.service2 | 11 ++++++ |
20 |
dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild | 46 ++++++++++++++++++++++ |
21 |
dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild | 46 ++++++++++++++++++++++ |
22 |
3 files changed, 103 insertions(+) |
23 |
|
24 |
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service2 b/dev-util/jenkins-bin/files/jenkins-bin.service2 |
25 |
new file mode 100644 |
26 |
index 00000000000..f109fac02cc |
27 |
--- /dev/null |
28 |
+++ b/dev-util/jenkins-bin/files/jenkins-bin.service2 |
29 |
@@ -0,0 +1,11 @@ |
30 |
+[Unit] |
31 |
+Description=Jenkins Daemon |
32 |
+ |
33 |
+[Service] |
34 |
+EnvironmentFile=/etc/conf.d/jenkins |
35 |
+Type=forking |
36 |
+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} |
37 |
+User=jenkins |
38 |
+ |
39 |
+[Install] |
40 |
+WantedBy=multi-user.target |
41 |
|
42 |
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 |
43 |
new file mode 100644 |
44 |
index 00000000000..c8cffcf979a |
45 |
--- /dev/null |
46 |
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild |
47 |
@@ -0,0 +1,46 @@ |
48 |
+# Copyright 1999-2018 Gentoo Authors |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+ |
51 |
+EAPI=7 |
52 |
+ |
53 |
+inherit user systemd |
54 |
+ |
55 |
+DESCRIPTION="Extensible continuous integration server" |
56 |
+HOMEPAGE="https://jenkins.io/" |
57 |
+LICENSE="MIT" |
58 |
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war" |
59 |
+RESTRICT="mirror" |
60 |
+SLOT="lts" |
61 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux" |
62 |
+IUSE="" |
63 |
+ |
64 |
+RDEPEND="media-fonts/dejavu |
65 |
+ media-libs/freetype |
66 |
+ !dev-util/jenkins-bin:0 |
67 |
+ >=virtual/jre-1.8.0" |
68 |
+ |
69 |
+S=${WORKDIR} |
70 |
+ |
71 |
+JENKINS_DIR=/var/lib/jenkins |
72 |
+ |
73 |
+pkg_setup() { |
74 |
+ enewgroup jenkins |
75 |
+ enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins |
76 |
+} |
77 |
+ |
78 |
+src_install() { |
79 |
+ keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home |
80 |
+ |
81 |
+ insinto /opt/jenkins |
82 |
+ newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war |
83 |
+ |
84 |
+ insinto /etc/logrotate.d |
85 |
+ newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} |
86 |
+ |
87 |
+ newinitd "${FILESDIR}"/${PN}.init2 jenkins |
88 |
+ newconfd "${FILESDIR}"/${PN}.confd jenkins |
89 |
+ |
90 |
+ systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service |
91 |
+ |
92 |
+ fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup |
93 |
+} |
94 |
|
95 |
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..95c4fb75944 |
98 |
--- /dev/null |
99 |
+++ b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild |
100 |
@@ -0,0 +1,46 @@ |
101 |
+# Copyright 1999-2018 Gentoo Authors |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=7 |
105 |
+ |
106 |
+inherit user systemd |
107 |
+ |
108 |
+DESCRIPTION="Extensible continuous integration server" |
109 |
+HOMEPAGE="https://jenkins.io/" |
110 |
+LICENSE="MIT" |
111 |
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war" |
112 |
+RESTRICT="mirror" |
113 |
+SLOT="0" |
114 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux" |
115 |
+IUSE="" |
116 |
+ |
117 |
+RDEPEND="media-fonts/dejavu |
118 |
+ media-libs/freetype |
119 |
+ !dev-util/jenkins-bin:lts |
120 |
+ >=virtual/jre-1.8.0" |
121 |
+ |
122 |
+S=${WORKDIR} |
123 |
+ |
124 |
+JENKINS_DIR=/var/lib/jenkins |
125 |
+ |
126 |
+pkg_setup() { |
127 |
+ enewgroup jenkins |
128 |
+ enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins |
129 |
+} |
130 |
+ |
131 |
+src_install() { |
132 |
+ keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home |
133 |
+ |
134 |
+ insinto /opt/jenkins |
135 |
+ newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war |
136 |
+ |
137 |
+ insinto /etc/logrotate.d |
138 |
+ newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} |
139 |
+ |
140 |
+ newinitd "${FILESDIR}"/${PN}.init2 jenkins |
141 |
+ newconfd "${FILESDIR}"/${PN}.confd jenkins |
142 |
+ |
143 |
+ systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service |
144 |
+ |
145 |
+ fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup |
146 |
+} |