1 |
matsuu 08/03/05 16:15:54 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-0.24.2.ebuild |
5 |
Log: |
6 |
Version bumped, bug #212262. Fixed /etc/init.d/puppetmaster, bug #211910. |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.11 app-admin/puppet/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.11&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.11&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.10&r2=1.11 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
19 |
retrieving revision 1.10 |
20 |
retrieving revision 1.11 |
21 |
diff -u -r1.10 -r1.11 |
22 |
--- ChangeLog 7 Feb 2008 16:45:04 -0000 1.10 |
23 |
+++ ChangeLog 5 Mar 2008 16:15:54 -0000 1.11 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for app-admin/puppet |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.10 2008/02/07 16:45:04 matsuu Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.11 2008/03/05 16:15:54 matsuu Exp $ |
29 |
+ |
30 |
+*puppet-0.24.2 (05 Mar 2008) |
31 |
+ |
32 |
+ 05 Mar 2008; MATSUU Takuto <matsuu@g.o> |
33 |
+ +files/puppet-0.24.2-gentoo.patch, +files/puppetmaster.init, |
34 |
+ +puppet-0.24.2.ebuild: |
35 |
+ Version bumped, bug #212262. |
36 |
+ Fixed /etc/init.d/puppetmaster, bug #211910. |
37 |
|
38 |
*puppet-0.24.1-r1 (07 Feb 2008) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 app-admin/puppet/puppet-0.24.2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: puppet-0.24.2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.2.ebuild,v 1.1 2008/03/05 16:15:54 matsuu Exp $ |
53 |
|
54 |
inherit elisp-common eutils ruby |
55 |
|
56 |
DESCRIPTION="A system automation and configuration management software" |
57 |
HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html" |
58 |
SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
IUSE="emacs vim-syntax" |
63 |
KEYWORDS="~x86 ~amd64" |
64 |
|
65 |
DEPEND="emacs? ( virtual/emacs )" |
66 |
RDEPEND="${DEPEND} |
67 |
>=dev-ruby/facter-1.3.5 |
68 |
>=app-portage/eix-0.9.4" |
69 |
|
70 |
USE_RUBY="ruby18" |
71 |
|
72 |
SITEFILE="50${PN}-mode-gentoo.el" |
73 |
|
74 |
pkg_setup() { |
75 |
built_with_use virtual/ruby ipv6 || \ |
76 |
die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run" |
77 |
|
78 |
enewgroup puppet || die "Problem creating group puppet" |
79 |
enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet" |
80 |
} |
81 |
|
82 |
src_unpack() { |
83 |
unpack ${A} |
84 |
cd "${S}" |
85 |
|
86 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
87 |
} |
88 |
|
89 |
src_compile() { |
90 |
if use emacs ; then |
91 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
92 |
fi |
93 |
} |
94 |
|
95 |
src_install() { |
96 |
DESTDIR="${D}" ruby_einstall "$@" || die |
97 |
DESTDIR="${D}" erubydoc |
98 |
|
99 |
# Installation of init scripts and configuration |
100 |
# bug #211910 |
101 |
#doinitd conf/gentoo/init.d/puppetmaster |
102 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster |
103 |
doconfd conf/gentoo/conf.d/puppetmaster |
104 |
doinitd conf/gentoo/init.d/puppet |
105 |
doconfd conf/gentoo/conf.d/puppet |
106 |
|
107 |
# Initial configuration files |
108 |
keepdir /etc/puppet/manifests |
109 |
insinto /etc/puppet |
110 |
doins conf/gentoo/puppet/* |
111 |
|
112 |
# Location of log and data files |
113 |
keepdir /var/run/puppet |
114 |
keepdir /var/log/puppet |
115 |
keepdir /var/lib/puppet/ssl |
116 |
keepdir /var/lib/puppet/files |
117 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet |
118 |
|
119 |
if use emacs ; then |
120 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
121 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
122 |
fi |
123 |
|
124 |
if use vim-syntax ; then |
125 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim |
126 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim |
127 |
fi |
128 |
|
129 |
# ext and examples files |
130 |
for f in $(find ext examples -type f) ; do |
131 |
docinto $(dirname ${f}) |
132 |
dodoc ${f} |
133 |
done |
134 |
} |
135 |
|
136 |
pkg_postinst() { |
137 |
elog |
138 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
139 |
elog "cause puppet to hang while installing packages." |
140 |
elog |
141 |
elog "Puppet uses eix to get information about currently installed packages," |
142 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
143 |
elog "handle package installations." |
144 |
elog |
145 |
elog "Currently puppet only supports adding and removing services to the default" |
146 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
147 |
elog "do so using symlinking." |
148 |
elog |
149 |
|
150 |
if [ \ |
151 |
-f "${ROOT}/etc/puppet/puppetd.conf" -o \ |
152 |
-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \ |
153 |
-f "${ROOT}/etc/puppet/puppetca.conf" \ |
154 |
] ; then |
155 |
elog |
156 |
elog "Please remove deprecated config files." |
157 |
elog " /etc/puppet/puppetca.conf" |
158 |
elog " /etc/puppet/puppetd.conf" |
159 |
elog " /etc/puppet/puppetmasterd.conf" |
160 |
elog |
161 |
fi |
162 |
use emacs && elisp-site-regen |
163 |
} |
164 |
pkg_postrm() { |
165 |
use emacs && elisp-site-regen |
166 |
} |
167 |
|
168 |
|
169 |
|
170 |
-- |
171 |
gentoo-commits@l.g.o mailing list |