summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2015-07-18 09:11:01 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2015-07-18 09:11:01 +0000
commitd8e1c0b76c4ae62f560ba05c2f6f2d398a199468 (patch)
tree3adb6e80d5037e54defd94dffcf7b9554532977b /app-admin/puppetdb
parentUse default CPAN HOMPAGE comes from perl-module.eclass, (sourforge one is dead) (diff)
downloadgentoo-2-d8e1c0b76c4ae62f560ba05c2f6f2d398a199468.tar.gz
gentoo-2-d8e1c0b76c4ae62f560ba05c2f6f2d398a199468.tar.bz2
gentoo-2-d8e1c0b76c4ae62f560ba05c2f6f2d398a199468.zip
hopefully final update
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'app-admin/puppetdb')
-rw-r--r--app-admin/puppetdb/ChangeLog6
-rw-r--r--app-admin/puppetdb/files/puppetdb.initd4
-rw-r--r--app-admin/puppetdb/puppetdb-3.0.1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/app-admin/puppetdb/ChangeLog b/app-admin/puppetdb/ChangeLog
index f168d9d6ff40..a1b4a6119cbd 100644
--- a/app-admin/puppetdb/ChangeLog
+++ b/app-admin/puppetdb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/puppetdb
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/ChangeLog,v 1.3 2015/07/18 08:30:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/ChangeLog,v 1.4 2015/07/18 09:11:01 prometheanfire Exp $
+
+ 18 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> files/puppetdb.initd,
+ puppetdb-3.0.1.ebuild:
+ hopefully final update
18 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> puppetdb-3.0.1.ebuild:
fixing minor typo, no installed files changed
diff --git a/app-admin/puppetdb/files/puppetdb.initd b/app-admin/puppetdb/files/puppetdb.initd
index a48453353bdf..d360a6731f1b 100644
--- a/app-admin/puppetdb/files/puppetdb.initd
+++ b/app-admin/puppetdb/files/puppetdb.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/files/puppetdb.initd,v 1.1 2015/07/18 07:52:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/files/puppetdb.initd,v 1.2 2015/07/18 09:11:01 prometheanfire Exp $
extra_commands="checkconfig"
@@ -47,8 +47,6 @@ checkconfig() {
start() {
checkconfig || return 1
- daemon --user $USER --pidfile $PIDFILE "$EXEC >> /var/log/puppetlabs/puppetdb/puppetdb-daemon.log 2>&1 &"
-
ebegin "Starting PuppetDB"
start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
--exec ${EXEC} --pidfile "${RUNDIR}/puppetdb.pid" \
diff --git a/app-admin/puppetdb/puppetdb-3.0.1.ebuild b/app-admin/puppetdb/puppetdb-3.0.1.ebuild
index ae0d98aab9fd..bc6a3532b325 100644
--- a/app-admin/puppetdb/puppetdb-3.0.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/puppetdb-3.0.1.ebuild,v 1.3 2015/07/18 08:30:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/puppetdb-3.0.1.ebuild,v 1.4 2015/07/18 09:11:01 prometheanfire Exp $
EAPI=5
@@ -28,6 +28,8 @@ src_prepare() {
sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
}
src_compile() {