[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[Conrad Kostecki]

commit:     80b5e2bb82b9bd88a9daeaa8cef0cc44f2340f32
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct  7 20:20:48 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b5e2bb

dev-util/jenkins-bin: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27685
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/jenkins-bin/files/jenkins-bin-r2.service | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r2.service b/dev-util/jenkins-bin/files/jenkins-bin-r2.service
deleted file mode 100644
index f109fac02cc9..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r2.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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

[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[Conrad Kostecki]

commit:     7a3e78d8ddaf647b605f3d9235c6d7efadf869b0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar 10 06:47:04 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:00:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3e78d8

dev-util/jenkins-bin: remove unused files

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30040
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/jenkins-bin/files/jenkins-bin-r2.init    | 52 -------------------
 dev-util/jenkins-bin/files/jenkins-bin-r3.service | 11 ----
 dev-util/jenkins-bin/files/jenkins-bin.confd      | 62 -----------------------
 3 files changed, 125 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r2.init b/dev-util/jenkins-bin/files/jenkins-bin-r2.init
deleted file mode 100644
index 93d4d5f7e687..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r2.init
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-    need net
-    use dns logger mysql postgresql
-}
-
-checkconfig() {
-    if [ ! -n "$JENKINS_HOME" ] ; then
-        eerror "JENKINS_HOME not configured"
-        return 1
-    fi
-    if [ ! -d "$JENKINS_HOME" ] ; then
-        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return 1
-
-    JAVA_HOME=`java-config --jre-home`
-    COMMAND=$JAVA_HOME/bin/java
-
-    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
-
-    # Don't use --daemon here, because in this case stop will not work
-    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
-    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
-    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
-    [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
-    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
-    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
-
-    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
-        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
-    fi
-
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet --background \
-        --make-pidfile --pidfile $JENKINS_PIDFILE \
-        --user ${JENKINS_USER} \
-        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
-    eend $?
-}

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
deleted file mode 100644
index 520a052f43f1..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r3.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin.confd
deleted file mode 100644
index f84e3463e359..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.confd
+++ /dev/null
@@ -1,62 +0,0 @@
-# Config file for /etc/init.d/jenkins
-
-#
-# Directory where Jenkins store its configuration and working
-# files (checkouts, build reports, artifacts, ...).
-#
-JENKINS_HOME="/var/lib/jenkins/home"
-
-#
-# Options to pass to java when running Jenkins.
-#
-JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
-
-#
-# Port Jenkins is listening on.
-#
-JENKINS_PORT="8080"
-
-#
-# Debug level for logs -- the higher the value, the more verbose.
-# 5 is INFO.
-#
-JENKINS_DEBUG_LEVEL="5"
-
-#
-# Whether to enable access logging or not.
-#
-JENKINS_ENABLE_ACCESS_LOG="no"
-
-#
-# Maximum number of HTTP worker threads.
-#
-JENKINS_HANDLER_MAX="100"
-
-#
-# Maximum number of idle HTTP worker threads.
-#
-JENKINS_HANDLER_IDLE="20"
-
-#
-# Pass arbitrary arguments to Jenkins.
-# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
-# Full option list: java -jar jenkins.war --help
-#
-JENKINS_ARGS=""
-
-#
-# User
-#
-JENKINS_USER=jenkins
-
-
-
-#
-# Pid File 
-#
-JENKINS_PIDFILE="/var/run/jenkins.pid"
-
-#
-# War File
-#
-JENKINS_WAR="/opt/jenkins/jenkins.war"

[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[Conrad Kostecki]

commit:     886d5067369734fa7cd1f40439682ed6de005449
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 20 10:45:31 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=886d5067

dev-util/jenkins-bin: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31552
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate
deleted file mode 100644
index 895461f0540e..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r2.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
-    compress
-    dateext
-    maxage 365
-    rotate 99
-    size 4M
-    notifempty
-    missingok
-    create 644
-    postrotate
-        [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins
-        if [ -s /var/run/jenkins.pid ]; then
-            JPID=$(cat /var/run/jenkins.pid)
-            test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || :
-        fi
-    endscript
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[Hans de Graaff]

commit:     783d29a3e7649770416c98c399da050c3b2c77a8
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 18:23:16 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 18:25:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783d29a3

dev-util/jenkins-bin/files: cleanup files

Remove whitespace and unused handler option.

Thanks to Alexander Brandes in https://github.com/gentoo/gentoo/pull/30122

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-util/jenkins-bin/files/jenkins-bin-r1.confd | 4 +---
 dev-util/jenkins-bin/files/jenkins-bin-r3.init  | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.confd b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
index 6bb38f3e6ce3..208dd2850408 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
@@ -39,10 +39,8 @@ JENKINS_ARGS=""
 #
 JENKINS_USER=jenkins
 
-
-
 #
-# Pid File 
+# Pid File
 #
 JENKINS_PIDFILE="/var/run/jenkins.pid"
 

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.init b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
index 96ddbc1fd421..b5c02a0ea2b5 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r3.init
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
@@ -28,7 +28,6 @@ start() {
     PARAMS="--logfile=/var/log/jenkins/jenkins.log"
     [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
     [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
     [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
 
     if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/jenkins-bin/files/

[Conrad Kostecki]

commit:     9bfd0f4aec3b8ca8a37cd9cadd6f10f3bfdded4b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Aug 28 19:47:17 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 07:48:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfd0f4a

dev-util/jenkins-bin: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32495
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/jenkins-bin/files/jenkins-bin-r4.service | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r4.service b/dev-util/jenkins-bin/files/jenkins-bin-r4.service
deleted file mode 100644
index dfe0d174f365..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r4.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target