Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/
Date: Tue, 14 Mar 2023 23:01:55
Message-Id: 1678834851.7a3e78d8ddaf647b605f3d9235c6d7efadf869b0.conikost@gentoo
1 commit: 7a3e78d8ddaf647b605f3d9235c6d7efadf869b0
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Fri Mar 10 06:47:04 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 14 23:00:51 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3e78d8
7
8 dev-util/jenkins-bin: remove unused files
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/30040
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 dev-util/jenkins-bin/files/jenkins-bin-r2.init | 52 -------------------
15 dev-util/jenkins-bin/files/jenkins-bin-r3.service | 11 ----
16 dev-util/jenkins-bin/files/jenkins-bin.confd | 62 -----------------------
17 3 files changed, 125 deletions(-)
18
19 diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r2.init b/dev-util/jenkins-bin/files/jenkins-bin-r2.init
20 deleted file mode 100644
21 index 93d4d5f7e687..000000000000
22 --- a/dev-util/jenkins-bin/files/jenkins-bin-r2.init
23 +++ /dev/null
24 @@ -1,52 +0,0 @@
25 -#!/sbin/openrc-run
26 -
27 -depend() {
28 - need net
29 - use dns logger mysql postgresql
30 -}
31 -
32 -checkconfig() {
33 - if [ ! -n "$JENKINS_HOME" ] ; then
34 - eerror "JENKINS_HOME not configured"
35 - return 1
36 - fi
37 - if [ ! -d "$JENKINS_HOME" ] ; then
38 - checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
39 - fi
40 - return 0
41 -}
42 -
43 -start() {
44 - checkconfig || return 1
45 -
46 - JAVA_HOME=`java-config --jre-home`
47 - COMMAND=$JAVA_HOME/bin/java
48 -
49 - JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
50 -
51 - # Don't use --daemon here, because in this case stop will not work
52 - PARAMS="--logfile=/var/log/jenkins/jenkins.log"
53 - [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
54 - [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
55 - [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
56 - [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
57 - [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
58 - [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
59 -
60 - if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
61 - PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
62 - fi
63 -
64 - ebegin "Starting ${SVCNAME}"
65 - start-stop-daemon --start --quiet --background \
66 - --make-pidfile --pidfile $JENKINS_PIDFILE \
67 - --user ${JENKINS_USER} \
68 - --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
69 - eend $?
70 -}
71 -
72 -stop() {
73 - ebegin "Stopping ${SVCNAME}"
74 - start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
75 - eend $?
76 -}
77
78 diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
79 deleted file mode 100644
80 index 520a052f43f1..000000000000
81 --- a/dev-util/jenkins-bin/files/jenkins-bin-r3.service
82 +++ /dev/null
83 @@ -1,11 +0,0 @@
84 -[Unit]
85 -Description=Jenkins Daemon
86 -
87 -[Service]
88 -EnvironmentFile=/etc/conf.d/jenkins
89 -Type=simple
90 -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}
91 -User=jenkins
92 -
93 -[Install]
94 -WantedBy=multi-user.target
95
96 diff --git a/dev-util/jenkins-bin/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin.confd
97 deleted file mode 100644
98 index f84e3463e359..000000000000
99 --- a/dev-util/jenkins-bin/files/jenkins-bin.confd
100 +++ /dev/null
101 @@ -1,62 +0,0 @@
102 -# Config file for /etc/init.d/jenkins
103 -
104 -#
105 -# Directory where Jenkins store its configuration and working
106 -# files (checkouts, build reports, artifacts, ...).
107 -#
108 -JENKINS_HOME="/var/lib/jenkins/home"
109 -
110 -#
111 -# Options to pass to java when running Jenkins.
112 -#
113 -JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
114 -
115 -#
116 -# Port Jenkins is listening on.
117 -#
118 -JENKINS_PORT="8080"
119 -
120 -#
121 -# Debug level for logs -- the higher the value, the more verbose.
122 -# 5 is INFO.
123 -#
124 -JENKINS_DEBUG_LEVEL="5"
125 -
126 -#
127 -# Whether to enable access logging or not.
128 -#
129 -JENKINS_ENABLE_ACCESS_LOG="no"
130 -
131 -#
132 -# Maximum number of HTTP worker threads.
133 -#
134 -JENKINS_HANDLER_MAX="100"
135 -
136 -#
137 -# Maximum number of idle HTTP worker threads.
138 -#
139 -JENKINS_HANDLER_IDLE="20"
140 -
141 -#
142 -# Pass arbitrary arguments to Jenkins.
143 -# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
144 -# Full option list: java -jar jenkins.war --help
145 -#
146 -JENKINS_ARGS=""
147 -
148 -#
149 -# User
150 -#
151 -JENKINS_USER=jenkins
152 -
153 -
154 -
155 -#
156 -# Pid File
157 -#
158 -JENKINS_PIDFILE="/var/run/jenkins.pid"
159 -
160 -#
161 -# War File
162 -#
163 -JENKINS_WAR="/opt/jenkins/jenkins.war"