1 |
matsuu 08/09/24 14:49:04 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: puppet-0.24.5-r2.ebuild |
5 |
Log: |
6 |
Fixed init.d issue again, bug #237712. Added ldap and rrdtool USE flags, bug #237717. |
7 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.23 app-admin/puppet/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.23&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.23&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.22&r2=1.23 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
19 |
retrieving revision 1.22 |
20 |
retrieving revision 1.23 |
21 |
diff -u -r1.22 -r1.23 |
22 |
--- ChangeLog 15 Sep 2008 00:35:23 -0000 1.22 |
23 |
+++ ChangeLog 24 Sep 2008 14:49:03 -0000 1.23 |
24 |
@@ -1,6 +1,13 @@ |
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.22 2008/09/15 00:35:23 matsuu Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.23 2008/09/24 14:49:03 matsuu Exp $ |
29 |
+ |
30 |
+*puppet-0.24.5-r2 (24 Sep 2008) |
31 |
+ |
32 |
+ 24 Sep 2008; MATSUU Takuto <matsuu@g.o> files/puppet.init, |
33 |
+ files/puppetmaster.init, metadata.xml, +puppet-0.24.5-r2.ebuild: |
34 |
+ Fixed init.d issue again, bug #237712. Added ldap and rrdtool USE flags, |
35 |
+ bug #237717. |
36 |
|
37 |
15 Sep 2008; MATSUU Takuto <matsuu@g.o> puppet-0.24.4.ebuild, |
38 |
-puppet-0.24.5.ebuild, puppet-0.24.5-r1.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.3 app-admin/puppet/metadata.xml |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/metadata.xml?rev=1.3&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/metadata.xml?rev=1.3&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/metadata.xml?r1=1.2&r2=1.3 |
47 |
|
48 |
Index: metadata.xml |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/metadata.xml,v |
51 |
retrieving revision 1.2 |
52 |
retrieving revision 1.3 |
53 |
diff -u -r1.2 -r1.3 |
54 |
--- metadata.xml 8 Dec 2007 00:39:30 -0000 1.2 |
55 |
+++ metadata.xml 24 Sep 2008 14:49:03 -0000 1.3 |
56 |
@@ -1,8 +1,24 @@ |
57 |
<?xml version="1.0" encoding="UTF-8"?> |
58 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
59 |
<pkgmetadata> |
60 |
-<herd>no-herd</herd> |
61 |
-<maintainer> |
62 |
- <email>matsuu@g.o</email> |
63 |
-</maintainer> |
64 |
+ <herd>no-herd</herd> |
65 |
+ <maintainer> |
66 |
+ <email>matsuu@g.o</email> |
67 |
+ </maintainer> |
68 |
+ <longdescription lang="en"> |
69 |
+ Centralised configuration management for networks |
70 |
+ Puppet lets you centrally manage every important aspect of your system |
71 |
+ using a cross-platform specification language that manages all the |
72 |
+ separate elements normally aggregated in different files, like users, |
73 |
+ cron jobs, and hosts, along with obviously discrete elements like |
74 |
+ packages, services, and files. |
75 |
+ |
76 |
+ Puppet's simple declarative specification language provides powerful |
77 |
+ classing abilities for drawing out the similarities between hosts while |
78 |
+ allowing them to be as specific as necessary, and it handles dependency |
79 |
+ and prerequisite relationships between objects clearly and explicitly. |
80 |
+ </longdescription> |
81 |
+ <use> |
82 |
+ <flag name='rrdtool'>Eanble rrdtool support</flag> |
83 |
+ </use> |
84 |
</pkgmetadata> |
85 |
|
86 |
|
87 |
|
88 |
1.1 app-admin/puppet/puppet-0.24.5-r2.ebuild |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.5-r2.ebuild?rev=1.1&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.5-r2.ebuild?rev=1.1&content-type=text/plain |
92 |
|
93 |
Index: puppet-0.24.5-r2.ebuild |
94 |
=================================================================== |
95 |
# Copyright 1999-2008 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.5-r2.ebuild,v 1.1 2008/09/24 14:49:03 matsuu Exp $ |
98 |
|
99 |
inherit elisp-common eutils ruby |
100 |
|
101 |
DESCRIPTION="A system automation and configuration management software" |
102 |
HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html" |
103 |
SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz" |
104 |
|
105 |
LICENSE="GPL-2" |
106 |
SLOT="0" |
107 |
IUSE="emacs ldap rrdtool vim-syntax" |
108 |
#KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
109 |
KEYWORDS="~amd64 ~x86" |
110 |
|
111 |
DEPEND="emacs? ( virtual/emacs ) |
112 |
>=dev-ruby/facter-1.1.0" |
113 |
RDEPEND="${DEPEND} |
114 |
>=app-portage/eix-0.9.4 |
115 |
ldap? ( dev-ruby/ruby-ldap ) |
116 |
rrdtool? ( dev-ruby/ruby-rrd )" |
117 |
# || ( |
118 |
# www-servers/webrick |
119 |
# www-servers/mongrel |
120 |
# ) |
121 |
# dev-ruby/diff-lcs |
122 |
# dev-ruby/rails |
123 |
# dev-ruby/ruby-shadow |
124 |
|
125 |
USE_RUBY="ruby18 ruby19" |
126 |
|
127 |
SITEFILE="50${PN}-mode-gentoo.el" |
128 |
|
129 |
pkg_setup() { |
130 |
built_with_use virtual/ruby ipv6 || \ |
131 |
die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run" |
132 |
|
133 |
enewgroup puppet |
134 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
135 |
} |
136 |
|
137 |
src_unpack() { |
138 |
unpack ${A} |
139 |
cd "${S}" |
140 |
|
141 |
epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch" |
142 |
} |
143 |
|
144 |
src_compile() { |
145 |
if use emacs ; then |
146 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
147 |
fi |
148 |
} |
149 |
|
150 |
src_install() { |
151 |
DESTDIR="${D}" ruby_einstall "$@" || die |
152 |
DESTDIR="${D}" erubydoc |
153 |
|
154 |
# |
155 |
# bug #237071 |
156 |
# |
157 |
#doinitd conf/gentoo/init.d/puppetmaster |
158 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster |
159 |
doconfd conf/gentoo/conf.d/puppetmaster |
160 |
#doinitd conf/gentoo/init.d/puppet |
161 |
newinitd "${FILESDIR}"/puppet.init puppet |
162 |
doconfd conf/gentoo/conf.d/puppet |
163 |
|
164 |
# Initial configuration files |
165 |
keepdir /etc/puppet/manifests |
166 |
insinto /etc/puppet |
167 |
doins conf/gentoo/puppet/* |
168 |
|
169 |
# Location of log and data files |
170 |
keepdir /var/run/puppet |
171 |
keepdir /var/log/puppet |
172 |
keepdir /var/lib/puppet/ssl |
173 |
keepdir /var/lib/puppet/files |
174 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet |
175 |
|
176 |
if use emacs ; then |
177 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
178 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
179 |
fi |
180 |
|
181 |
if use vim-syntax ; then |
182 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim |
183 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim |
184 |
fi |
185 |
|
186 |
# ext and examples files |
187 |
for f in $(find ext examples -type f) ; do |
188 |
docinto $(dirname ${f}) |
189 |
dodoc ${f} |
190 |
done |
191 |
} |
192 |
|
193 |
pkg_postinst() { |
194 |
elog |
195 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
196 |
elog "cause puppet to hang while installing packages." |
197 |
elog |
198 |
elog "Puppet uses eix to get information about currently installed packages," |
199 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
200 |
elog "handle package installations." |
201 |
elog |
202 |
elog "Currently puppet only supports adding and removing services to the default" |
203 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
204 |
elog "do so using symlinking." |
205 |
elog |
206 |
|
207 |
if [ \ |
208 |
-f "${ROOT}/etc/puppet/puppetd.conf" -o \ |
209 |
-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \ |
210 |
-f "${ROOT}/etc/puppet/puppetca.conf" \ |
211 |
] ; then |
212 |
elog |
213 |
elog "Please remove deprecated config files." |
214 |
elog " /etc/puppet/puppetca.conf" |
215 |
elog " /etc/puppet/puppetd.conf" |
216 |
elog " /etc/puppet/puppetmasterd.conf" |
217 |
elog |
218 |
fi |
219 |
use emacs && elisp-site-regen |
220 |
} |
221 |
pkg_postrm() { |
222 |
use emacs && elisp-site-regen |
223 |
} |