summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2008-09-09 09:20:05 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2008-09-09 09:20:05 +0000
commitc390f38ad78f141f059c13c311522388f3231f3d (patch)
tree6169f937fdae196fc3796811365d2adffe1f1d8a /app-admin/puppet
parentVersion bump (diff)
downloadhistorical-c390f38ad78f141f059c13c311522388f3231f3d.tar.gz
historical-c390f38ad78f141f059c13c311522388f3231f3d.tar.bz2
historical-c390f38ad78f141f059c13c311522388f3231f3d.zip
Fixed init.d issue, bug 237071.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'app-admin/puppet')
-rw-r--r--app-admin/puppet/ChangeLog8
-rw-r--r--app-admin/puppet/Manifest6
-rwxr-xr-xapp-admin/puppet/files/puppet.init38
-rwxr-xr-xapp-admin/puppet/files/puppetmaster.init3
-rw-r--r--app-admin/puppet/puppet-0.24.5-r1.ebuild119
5 files changed, 170 insertions, 4 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 9268a63f7091..760855ab73a3 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/puppet
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.20 2008/08/13 16:51:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.21 2008/09/09 09:20:04 matsuu Exp $
+
+*puppet-0.24.5-r1 (09 Sep 2008)
+
+ 09 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> +files/puppet.init,
+ files/puppetmaster.init, +puppet-0.24.5-r1.ebuild:
+ Fixed init.d issue, bug 237071.
*puppet-0.24.5 (13 Aug 2008)
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4b0fda238afa..1a1d513e1d39 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,10 +1,12 @@
AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 SHA1 208a9a008dec0de89839c71e4d3a86c08be6931d SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde
AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
-AUX puppetmaster.init 1387 RMD160 875af92960c94c2f135a72ec381eb38392d9cdbf SHA1 d49511ffe50b94f85d671d7df15fc2a1a9e2f16d SHA256 757bed4b949aa2f4ed84ea498e4d3366bad60bd41fec9429941aeda537688cff
+AUX puppet.init 1080 RMD160 cef3b7177d46777444e9b4c8854336a389bde554 SHA1 3ddbabedada1ba35d1237fd0dab1bd5e7c878efe SHA256 ad0309778c20cba24c320eca4425f1546a77e4b6d16445e4236152ca3d7746dc
+AUX puppetmaster.init 1374 RMD160 a367064b0a659e28b326a259cc9f9ce028d691a5 SHA1 a2fbf7a6144889d5fdc78bf5a760fb43a6145ed4 SHA256 7871fc9710541f7b257d7069df1aaef2120420f3dec53a17b442e63a7bbb0141
DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
DIST puppet-0.24.5.tgz 872803 RMD160 be85ce18ce6a56939eaf83c60cc55d1c5134ef36 SHA1 fe3d63bf30169eb6ec2b30e43d489a51bb36d090 SHA256 0b5ff82b06699a5d10b2ee6e995f427b76540cc0e67ffa8243ee6fc03d8e641d
EBUILD puppet-0.24.4.ebuild 3346 RMD160 9e8c306d87393709bdf719cdb2915717b96e0460 SHA1 bfaec805440ad87fe484030340eba132967e9755 SHA256 5cba4f4c72880c66d091dc25d80646d777446c9748c42da79503e8c0d6fac428
+EBUILD puppet-0.24.5-r1.ebuild 3306 RMD160 a50c77ce1447d865d6b4524cd61aa2acf5e485b5 SHA1 be6ca4bcf96fa4c1868fa45e1d668ea2224e0717 SHA256 145d42e99913708ae96929c043623129569750d6b11131acd52822c9717fac38
EBUILD puppet-0.24.5.ebuild 3303 RMD160 53ab9a60459efd9d552ee53461428438a80caced SHA1 3f44330fa3f3f803eaf00c75537df19231e09474 SHA256 f168b1d6b890fd0195906ee4a971ee30c3041c56010edac9cb9db9d75dcc1ad3
-MISC ChangeLog 3846 RMD160 ab4ce7440540e5db32acf3f750e66a01fef20c29 SHA1 097d5e7079209ee4f64806f4cba5ead12b08abdb SHA256 fe83bbeccbd4466af1661f629bd133bcff02800040fc6008b3012ea693329868
+MISC ChangeLog 4036 RMD160 742b2941068eb9162b01edf28a8bbaf038d6b626 SHA1 603a17d631d9a4ae8285a3c3e326f318f8d46c6a SHA256 0fb2e45e9b13aa64dd0eb60015d32dd9c94f4b2fb296522827f8cc9ed33872ca
MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
new file mode 100755
index 000000000000..019b51680ac7
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v 1.1 2008/09/09 09:20:05 matsuu Exp $
+
+depend() {
+ need net
+ use dns logger
+}
+
+checkconfig() {
+ if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
+ eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+ return 1
+ fi
+
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+
+ local options=""
+ [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+ ebegin "Starting puppet"
+ start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
+ eend $? "Failed to start puppet"
+}
+
+stop() {
+ ebegin "Stopping puppet"
+ start-stop-daemon --stop --quiet --pidfile ${PUPPET_PID_DIR}/puppetd.pid
+ local ret=$?
+ eend ${ret} "Failed to stop puppet"
+ rm -f ${PUPPET_PID_DIR}/puppetd.pid
+ return ${ret}
+}
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index 60231530a08e..e5ff580f6758 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -34,7 +34,7 @@ start() {
[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
ebegin "Starting puppetmaster"
- start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
+ start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
-- ${options}
eend $? "Failed to start puppetmaster"
}
@@ -48,3 +48,4 @@ stop() {
rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
return ${ret}
}
+
diff --git a/app-admin/puppet/puppet-0.24.5-r1.ebuild b/app-admin/puppet/puppet-0.24.5-r1.ebuild
new file mode 100644
index 000000000000..5356d867a653
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.5-r1.ebuild,v 1.1 2008/09/09 09:20:04 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs vim-syntax"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+ >=dev-ruby/facter-1.3.5
+ >=app-portage/eix-0.9.4"
+
+USE_RUBY="ruby18"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ built_with_use virtual/ruby ipv6 || \
+ die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
+
+ enewgroup puppet || die "Problem creating group puppet"
+ enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch"
+}
+
+src_compile() {
+ if use emacs ; then
+ elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ DESTDIR="${D}" ruby_einstall "$@" || die
+ DESTDIR="${D}" erubydoc
+
+ #
+ # bug #237071
+ #
+ #doinitd conf/gentoo/init.d/puppetmaster
+ newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+ doconfd conf/gentoo/conf.d/puppetmaster
+ #doinitd conf/gentoo/init.d/puppet
+ newinitd "${FILESDIR}"/puppet.init puppet
+ doconfd conf/gentoo/conf.d/puppet
+
+ # Initial configuration files
+ keepdir /etc/puppet/manifests
+ insinto /etc/puppet
+ doins conf/gentoo/puppet/*
+
+ # Location of log and data files
+ keepdir /var/run/puppet
+ keepdir /var/log/puppet
+ keepdir /var/lib/puppet/ssl
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/{run,log,lib}/puppet
+
+ if use emacs ; then
+ elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+ insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto $(dirname ${f})
+ dodoc ${f}
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Puppet uses eix to get information about currently installed packages,"
+ elog "so please keep the eix metadata cache updated so puppet is able to properly"
+ elog "handle package installations."
+ elog
+ elog "Currently puppet only supports adding and removing services to the default"
+ elog "runlevel, if you want to add/remove a service from another runlevel you may"
+ elog "do so using symlinking."
+ elog
+
+ if [ \
+ -f "${ROOT}/etc/puppet/puppetd.conf" -o \
+ -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
+ -f "${ROOT}/etc/puppet/puppetca.conf" \
+ ] ; then
+ elog
+ elog "Please remove deprecated config files."
+ elog " /etc/puppet/puppetca.conf"
+ elog " /etc/puppet/puppetd.conf"
+ elog " /etc/puppet/puppetmasterd.conf"
+ elog
+ fi
+ use emacs && elisp-site-regen
+}
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}