[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/files/, app-admin/puppetserver/
commit: 043d40cdb0aab8d973f675e2cf4bb853282e3b04
Author: Matthew Thode gentoo org>
AuthorDate: Mon Sep 23 19:18:15 2019 +
Commit: Matthew Thode gentoo org>
CommitDate: Mon Sep 23 19:18:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043d40cd
app-admin/puppetserver: add missing class
prevented puppetserver from loading
Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Matthew Thode gentoo.org>
app-admin/puppetserver/files/puppetserver.init-r1 | 72 ++
...r-6.6.0.ebuild => puppetserver-6.6.0-r1.ebuild} | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/app-admin/puppetserver/files/puppetserver.init-r1
b/app-admin/puppetserver/files/puppetserver.init-r1
new file mode 100644
index 000..2b7665d901a
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.init-r1
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+if [ ! -x $JAVA_BIN ]; then
+eerror "Missing JAVA_BIN."
+eend 1
+fi
+if [ ! -d $INSTALL_DIR ]; then
+eerror "Missing INSTALL_DIR."
+eend 1
+fi
+if [ ! -e $BOOTSTRAP_CONFIG ]; then
+eerror "Missing BOOTSTRAP_CONFIG."
+eend 1
+fi
+if [ ! -e $CONFIG ]; then
+eerror "Missing CONFIG."
+eend 1
+fi
+if [ ! -n $USER ]; then
+eerror "Missing USER."
+eend 1
+fi
+if [ ! -n $GROUP ]; then
+eerror "Missing GROUP."
+eend 1
+fi
+
+checkpath -d -m 0755 "${LOGDIR%/*}"
+checkpath -d -m 0755 "${RUNDIR%/*}"
+checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom
-XX:OnOutOfMemoryError=\"kill -9 %p\" -cp
${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar
clojure.main -m puppetlabs.trapperkeeper.main"
+PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d
--bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file
/opt/puppetlabs/server/data/puppetserver/restartcounter"
+EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}"
+}
+
+start() {
+checkconfig || return 1
+
+ebegin "Starting Puppet Server"
+start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+-m --pidfile "${RUNDIR}/puppetserver.pid" \
+-b --exec "/bin/bash" \
+-- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error starting puppetserver."
+fi
+eend $retval
+}
+
+stop() {
+ebegin "Stopping Puppet Server"
+start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+eend $?
+}
+
+reload() {
+ebegin "Reloading Puppet Server"
+start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+eend $?
+}
+
diff --git a/app-admin/puppetserver/puppetserver-6.6.0.ebuild
b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
similarity index 98%
rename from app-admin/puppetserver/puppetserver-6.6.0.ebuild
rename to app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
index 1b0b26fd739..45ac7ad8e73 100644
--- a/app-admin/puppetserver/puppetserver-6.6.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
@@ -96,7 +96,7 @@ src_install() {
newins ext/default puppetserver
# normal init type tasks
dosym ../default/puppetserver /etc/conf.d/puppetserver
- newinitd "${FILESDIR}/puppetserver.init" puppetserver
+ newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
# misc
insinto /etc/logrotate.d
newins ext/puppetserver.logrotate.conf puppetserver
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/files/
commit: 75d25cc10ed8d8c53c582aaf76c6c27680ce3bdd
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue Feb 13 18:44:37 2018 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Feb 13 19:03:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d25cc1
app-admin/puppetserver: remove unused file
Signed-off-by: Matthew Thode gentoo.org>
app-admin/puppetserver/files/puppetserver.initd | 71 -
1 file changed, 71 deletions(-)
diff --git a/app-admin/puppetserver/files/puppetserver.initd
b/app-admin/puppetserver/files/puppetserver.initd
deleted file mode 100644
index 080dd2c8de2..000
--- a/app-admin/puppetserver/files/puppetserver.initd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig reload"
-
-LOGDIR="/var/log/puppetlabs/puppetserver"
-RUNDIR="/run/puppetlabs/puppetserver"
-
-checkconfig() {
-if [ ! -x $JAVA_BIN ]; then
-eerror "Missing JAVA_BIN."
-eend 1
-fi
-if [ ! -d $INSTALL_DIR ]; then
-eerror "Missing INSTALL_DIR."
-eend 1
-fi
-if [ ! -e $BOOTSTRAP_CONFIG ]; then
-eerror "Missing BOOTSTRAP_CONFIG."
-eend 1
-fi
-if [ ! -e $CONFIG ]; then
-eerror "Missing CONFIG."
-eend 1
-fi
-if [ ! -n $USER ]; then
-eerror "Missing USER."
-eend 1
-fi
-if [ ! -n $GROUP ]; then
-eerror "Missing GROUP."
-eend 1
-fi
-
-checkpath -d -m 0755 "${LOGDIR%/*}"
-checkpath -d -m 0755 "${RUNDIR%/*}"
-checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
-checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
-
-JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppet-server-release.jar'
clojure.main -m puppetlabs.trapperkeeper.main --config ${CONFIG} -b
'${BOOTSTRAP_CONFIG}'"
-EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\"
-XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/puppetlabs/puppetserver
-Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
-}
-
-start() {
-checkconfig || return 1
-
-ebegin "Starting Puppet Server"
-start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
--m --pidfile "${RUNDIR}/puppetserver.pid" \
--b --exec "/bin/bash" \
--- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error starting puppetserver."
-fi
-eend $retval
-}
-
-stop() {
-ebegin "Stopping Puppet Server"
-start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
-eend $?
-}
-
-reload() {
-ebegin "Reloading Puppet Server"
-start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
-eend $?
-}
-
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/files/, app-admin/puppetserver/
commit: 7c9c93d88c4551f28b4c4b458e5bf3ef220d256d
Author: Matthew Thode gentoo org>
AuthorDate: Tue Jul 11 10:13:30 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Jul 11 10:21:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9c93d8
app-admin/puppetserver: fix init
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-admin/puppetserver/files/puppetserver.init | 72 ++
...r-5.0.0.ebuild => puppetserver-5.0.0-r1.ebuild} | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/app-admin/puppetserver/files/puppetserver.init
b/app-admin/puppetserver/files/puppetserver.init
new file mode 100644
index 000..34126ed8b1e
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.init
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+if [ ! -x $JAVA_BIN ]; then
+eerror "Missing JAVA_BIN."
+eend 1
+fi
+if [ ! -d $INSTALL_DIR ]; then
+eerror "Missing INSTALL_DIR."
+eend 1
+fi
+if [ ! -e $BOOTSTRAP_CONFIG ]; then
+eerror "Missing BOOTSTRAP_CONFIG."
+eend 1
+fi
+if [ ! -e $CONFIG ]; then
+eerror "Missing CONFIG."
+eend 1
+fi
+if [ ! -n $USER ]; then
+eerror "Missing USER."
+eend 1
+fi
+if [ ! -n $GROUP ]; then
+eerror "Missing GROUP."
+eend 1
+fi
+
+checkpath -d -m 0755 "${LOGDIR%/*}"
+checkpath -d -m 0755 "${RUNDIR%/*}"
+checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom
-XX:OnOutOfMemoryError=\"kill -9 %p\" -cp
${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar
clojure.main -m puppetlabs.trapperkeeper.main"
+PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d
--bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file
/opt/puppetlabs/server/data/puppetserver/restartcounter"
+EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}"
+}
+
+start() {
+checkconfig || return 1
+
+ebegin "Starting Puppet Server"
+start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+-m --pidfile "${RUNDIR}/puppetserver.pid" \
+-b --exec "/bin/bash" \
+-- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error starting puppetserver."
+fi
+eend $retval
+}
+
+stop() {
+ebegin "Stopping Puppet Server"
+start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+eend $?
+}
+
+reload() {
+ebegin "Reloading Puppet Server"
+start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+eend $?
+}
+
diff --git a/app-admin/puppetserver/puppetserver-5.0.0.ebuild
b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild
similarity index 98%
rename from app-admin/puppetserver/puppetserver-5.0.0.ebuild
rename to app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild
index f33b767e9cc..4d33cdceb73 100644
--- a/app-admin/puppetserver/puppetserver-5.0.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild
@@ -92,7 +92,7 @@ src_install() {
fperms -R 771 /etc/puppetlabs/puppet/ssl
# init type tasks
newconfd ext/default puppetserver
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+ newinitd "${FILESDIR}/puppetserver.init" puppetserver
# systemd type things
insinto /etc/systemd/system/puppetserver.service.d/
newins ext/default gentoo.conf
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/files/
commit: 3f327612bfd981a39f2fe855f0a618ce9491b049
Author: Matthew Thode gentoo org>
AuthorDate: Fri Mar 18 18:41:41 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Mar 18 18:41:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f327612
app-admin/puppetserver: fixing init.d
Package-Manager: portage-2.2.26
app-admin/puppetserver/files/puppetserver.initd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-admin/puppetserver/files/puppetserver.initd
b/app-admin/puppetserver/files/puppetserver.initd
index 9eef5e2..072aa6f 100644
--- a/app-admin/puppetserver/files/puppetserver.initd
+++ b/app-admin/puppetserver/files/puppetserver.initd
@@ -17,7 +17,7 @@ checkconfig() {
eerror "Missing INSTALL_DIR."
eend 1
fi
-if [ ! -a $BOOTSTRAP_CONFIG ]; then
+if [ ! -e $BOOTSTRAP_CONFIG ]; then
eerror "Missing BOOTSTRAP_CONFIG."
eend 1
fi
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/files/
commit: 900f481a57393118990abde87406c8bca4e97a71
Author: Matthew Thode gentoo org>
AuthorDate: Fri Mar 18 16:45:50 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Mar 18 16:45:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900f481a
app-admin/puppetserver: add reload command
Package-Manager: portage-2.2.26
app-admin/puppetserver/files/puppetserver.initd | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/app-admin/puppetserver/files/puppetserver.initd
b/app-admin/puppetserver/files/puppetserver.initd
index 42282db..9eef5e2 100644
--- a/app-admin/puppetserver/files/puppetserver.initd
+++ b/app-admin/puppetserver/files/puppetserver.initd
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-extra_commands="checkconfig"
+extra_commands="checkconfig reload"
LOGDIR="/var/log/puppetlabs/puppetserver"
RUNDIR="/run/puppetlabs/puppetserver"
@@ -63,3 +63,10 @@ stop() {
start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
eend $?
}
+
+reload() {
+ebegin "Reloading Puppet Server"
+start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+eend $?
+}
+
