puppet 2.6.0 → 2.6.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (246) hide show
  1. data/CHANGELOG +123 -0
  2. data/conf/redhat/puppet.spec +8 -2
  3. data/conf/solaris/smf/svc-puppetd +1 -1
  4. data/conf/solaris/smf/svc-puppetmasterd +1 -1
  5. data/conf/suse/client.init +4 -4
  6. data/conf/suse/fileserver.conf +12 -0
  7. data/conf/suse/logrotate +10 -0
  8. data/conf/suse/puppet.conf +25 -0
  9. data/conf/suse/puppet.spec +114 -49
  10. data/conf/suse/ruby-env.patch +17 -0
  11. data/conf/suse/server.init +4 -4
  12. data/ext/logcheck/puppet +23 -23
  13. data/ext/puppet-load.rb +357 -0
  14. data/ext/puppetstoredconfigclean.rb +3 -3
  15. data/ext/rack/files/config.ru +3 -5
  16. data/ext/vim/syntax/puppet.vim +6 -5
  17. data/install.rb +12 -11
  18. data/lib/puppet.rb +1 -1
  19. data/lib/puppet/agent.rb +3 -1
  20. data/lib/puppet/application.rb +2 -3
  21. data/lib/puppet/application/agent.rb +4 -0
  22. data/lib/puppet/application/apply.rb +14 -6
  23. data/lib/puppet/application/describe.rb +1 -1
  24. data/lib/puppet/application/doc.rb +2 -36
  25. data/lib/puppet/application/master.rb +0 -3
  26. data/lib/puppet/application/queue.rb +1 -0
  27. data/lib/puppet/configurer.rb +4 -0
  28. data/lib/puppet/daemon.rb +1 -1
  29. data/lib/puppet/defaults.rb +38 -44
  30. data/lib/puppet/file_serving/indirection_hooks.rb +2 -2
  31. data/lib/puppet/indirector/facts/memory.rb +1 -1
  32. data/lib/puppet/indirector/node/exec.rb +1 -1
  33. data/lib/puppet/indirector/node/ldap.rb +9 -53
  34. data/lib/puppet/indirector/node/memory.rb +1 -1
  35. data/lib/puppet/indirector/yaml.rb +6 -9
  36. data/lib/puppet/network/format_handler.rb +6 -0
  37. data/lib/puppet/network/formats.rb +4 -4
  38. data/lib/puppet/network/http/handler.rb +1 -1
  39. data/lib/puppet/network/http/rack.rb +3 -0
  40. data/lib/puppet/network/http/rack/rest.rb +1 -1
  41. data/lib/puppet/network/rest_authconfig.rb +6 -3
  42. data/lib/puppet/node/environment.rb +15 -5
  43. data/lib/puppet/parameter/value_collection.rb +3 -3
  44. data/lib/puppet/parser/ast/function.rb +0 -1
  45. data/lib/puppet/parser/ast/leaf.rb +1 -1
  46. data/lib/puppet/parser/ast/resource.rb +4 -3
  47. data/lib/puppet/parser/ast/resource_reference.rb +9 -2
  48. data/lib/puppet/parser/compiler.rb +12 -14
  49. data/lib/puppet/parser/files.rb +1 -1
  50. data/lib/puppet/parser/functions.rb +2 -2
  51. data/lib/puppet/parser/functions/defined.rb +1 -1
  52. data/lib/puppet/parser/functions/extlookup.rb +157 -0
  53. data/lib/puppet/parser/functions/file.rb +1 -1
  54. data/lib/puppet/parser/functions/inline_template.rb +6 -5
  55. data/lib/puppet/parser/functions/md5.rb +5 -0
  56. data/lib/puppet/parser/functions/realize.rb +1 -1
  57. data/lib/puppet/parser/functions/regsubst.rb +19 -19
  58. data/lib/puppet/parser/functions/require.rb +2 -3
  59. data/lib/puppet/parser/functions/split.rb +1 -1
  60. data/lib/puppet/parser/functions/sprintf.rb +1 -1
  61. data/lib/puppet/parser/functions/template.rb +4 -2
  62. data/lib/puppet/parser/functions/versioncmp.rb +12 -12
  63. data/lib/puppet/parser/lexer.rb +13 -14
  64. data/lib/puppet/parser/resource.rb +2 -7
  65. data/lib/puppet/parser/resource/param.rb +1 -1
  66. data/lib/puppet/parser/scope.rb +35 -0
  67. data/lib/puppet/parser/type_loader.rb +1 -1
  68. data/lib/puppet/property.rb +5 -5
  69. data/lib/puppet/provider.rb +3 -3
  70. data/lib/puppet/provider/group/groupadd.rb +1 -1
  71. data/lib/puppet/provider/group/ldap.rb +3 -3
  72. data/lib/puppet/provider/group/pw.rb +1 -1
  73. data/lib/puppet/provider/package/apple.rb +1 -1
  74. data/lib/puppet/provider/package/apt.rb +5 -1
  75. data/lib/puppet/provider/package/aptitude.rb +1 -1
  76. data/lib/puppet/provider/package/aptrpm.rb +1 -1
  77. data/lib/puppet/provider/package/blastwave.rb +1 -1
  78. data/lib/puppet/provider/package/dpkg.rb +2 -2
  79. data/lib/puppet/provider/package/fink.rb +1 -1
  80. data/lib/puppet/provider/package/gem.rb +1 -1
  81. data/lib/puppet/provider/package/openbsd.rb +1 -1
  82. data/lib/puppet/provider/package/rpm.rb +1 -1
  83. data/lib/puppet/provider/package/rug.rb +1 -1
  84. data/lib/puppet/provider/package/sunfreeware.rb +2 -2
  85. data/lib/puppet/provider/package/up2date.rb +1 -1
  86. data/lib/puppet/provider/package/urpmi.rb +1 -1
  87. data/lib/puppet/provider/package/yum.rb +1 -1
  88. data/lib/puppet/provider/package/zypper.rb +1 -1
  89. data/lib/puppet/provider/service/base.rb +1 -1
  90. data/lib/puppet/provider/service/bsd.rb +2 -2
  91. data/lib/puppet/provider/service/debian.rb +2 -2
  92. data/lib/puppet/provider/service/gentoo.rb +2 -2
  93. data/lib/puppet/provider/service/init.rb +2 -2
  94. data/lib/puppet/provider/service/redhat.rb +2 -2
  95. data/lib/puppet/provider/user/ldap.rb +3 -3
  96. data/lib/puppet/provider/user/pw.rb +1 -1
  97. data/lib/puppet/provider/user/user_role_add.rb +1 -1
  98. data/lib/puppet/provider/user/useradd.rb +1 -1
  99. data/lib/puppet/rails/host.rb +1 -0
  100. data/lib/puppet/reference/configuration.rb +37 -34
  101. data/lib/puppet/reference/indirection.rb +3 -4
  102. data/lib/puppet/reference/metaparameter.rb +0 -8
  103. data/lib/puppet/reference/network.rb +6 -4
  104. data/lib/puppet/reference/providers.rb +4 -4
  105. data/lib/puppet/reference/report.rb +5 -6
  106. data/lib/puppet/reference/type.rb +14 -14
  107. data/lib/puppet/reports/http.rb +1 -1
  108. data/lib/puppet/reports/rrdgraph.rb +8 -9
  109. data/lib/puppet/reports/store.rb +2 -2
  110. data/lib/puppet/reports/tagmail.rb +12 -13
  111. data/lib/puppet/resource.rb +15 -115
  112. data/lib/puppet/resource/catalog.rb +1 -1
  113. data/lib/puppet/resource/type.rb +26 -3
  114. data/lib/puppet/resource/type_collection.rb +3 -6
  115. data/lib/puppet/simple_graph.rb +4 -5
  116. data/lib/puppet/transaction/resource_harness.rb +1 -1
  117. data/lib/puppet/type.rb +100 -92
  118. data/lib/puppet/type/augeas.rb +44 -45
  119. data/lib/puppet/type/computer.rb +2 -2
  120. data/lib/puppet/type/cron.rb +29 -29
  121. data/lib/puppet/type/exec.rb +66 -67
  122. data/lib/puppet/type/file.rb +25 -25
  123. data/lib/puppet/type/file/content.rb +7 -1
  124. data/lib/puppet/type/file/ensure.rb +13 -13
  125. data/lib/puppet/type/file/mode.rb +6 -6
  126. data/lib/puppet/type/file/selcontext.rb +5 -5
  127. data/lib/puppet/type/file/source.rb +36 -26
  128. data/lib/puppet/type/filebucket.rb +5 -6
  129. data/lib/puppet/type/group.rb +1 -2
  130. data/lib/puppet/type/host.rb +3 -6
  131. data/lib/puppet/type/k5login.rb +3 -3
  132. data/lib/puppet/type/macauthorization.rb +1 -2
  133. data/lib/puppet/type/mailalias.rb +0 -1
  134. data/lib/puppet/type/maillist.rb +0 -1
  135. data/lib/puppet/type/mcx.rb +9 -9
  136. data/lib/puppet/type/mount.rb +9 -10
  137. data/lib/puppet/type/notify.rb +0 -1
  138. data/lib/puppet/type/package.rb +34 -36
  139. data/lib/puppet/type/resources.rb +1 -5
  140. data/lib/puppet/type/schedule.rb +9 -12
  141. data/lib/puppet/type/selboolean.rb +2 -7
  142. data/lib/puppet/type/selmodule.rb +3 -4
  143. data/lib/puppet/type/service.rb +9 -9
  144. data/lib/puppet/type/ssh_authorized_key.rb +2 -3
  145. data/lib/puppet/type/sshkey.rb +4 -7
  146. data/lib/puppet/type/stage.rb +5 -4
  147. data/lib/puppet/type/tidy.rb +3 -3
  148. data/lib/puppet/type/user.rb +1 -2
  149. data/lib/puppet/type/whit.rb +7 -0
  150. data/lib/puppet/type/yumrepo.rb +16 -3
  151. data/lib/puppet/type/zfs.rb +1 -2
  152. data/lib/puppet/type/zone.rb +28 -28
  153. data/lib/puppet/type/zpool.rb +10 -5
  154. data/lib/puppet/util/autoload.rb +17 -5
  155. data/lib/puppet/util/cacher.rb +15 -10
  156. data/lib/puppet/util/command_line/puppetdoc +5 -5
  157. data/lib/puppet/util/command_line/puppetrun +0 -2
  158. data/lib/puppet/util/command_line/ralsh +13 -13
  159. data/lib/puppet/util/docs.rb +5 -12
  160. data/lib/puppet/util/monkey_patches.rb +5 -2
  161. data/lib/puppet/util/nagios_maker.rb +4 -5
  162. data/lib/puppet/util/provider_features.rb +2 -2
  163. data/lib/puppet/util/rdoc.rb +1 -1
  164. data/lib/puppet/util/rdoc/parser.rb +5 -3
  165. data/lib/puppet/util/reference.rb +3 -52
  166. data/man/man5/puppet.conf.5 +2072 -1526
  167. data/man/man8/filebucket.8 +104 -106
  168. data/man/man8/pi.8 +14 -47
  169. data/man/man8/puppet.8 +8 -9
  170. data/man/man8/puppetca.8 +168 -129
  171. data/man/man8/puppetd.8 +282 -226
  172. data/man/man8/puppetdoc.8 +103 -103
  173. data/man/man8/puppetmasterd.8 +51 -71
  174. data/man/man8/puppetqd.8 +18 -53
  175. data/man/man8/puppetrun.8 +163 -143
  176. data/man/man8/ralsh.8 +77 -114
  177. data/spec/integration/indirector/bucket_file/rest_spec.rb +1 -0
  178. data/spec/integration/indirector/certificate/rest_spec.rb +1 -0
  179. data/spec/integration/indirector/certificate_request/rest_spec.rb +1 -0
  180. data/spec/integration/indirector/certificate_revocation_list/rest_spec.rb +1 -0
  181. data/spec/integration/indirector/report/rest_spec.rb +1 -0
  182. data/spec/integration/indirector/rest_spec.rb +1 -0
  183. data/spec/integration/network/server/webrick_spec.rb +1 -0
  184. data/spec/integration/parser/compiler_spec.rb +43 -0
  185. data/spec/integration/provider/mailalias/aliases_spec.rb +5 -5
  186. data/spec/integration/ssl/certificate_authority_spec.rb +1 -0
  187. data/spec/integration/ssl/certificate_request_spec.rb +1 -0
  188. data/spec/integration/ssl/certificate_revocation_list_spec.rb +1 -0
  189. data/spec/integration/ssl/host_spec.rb +1 -0
  190. data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +0 -1
  191. data/spec/monkey_patches/publicize_methods.rb +11 -0
  192. data/spec/shared_behaviours/file_serving.rb +12 -1
  193. data/spec/spec_helper.rb +6 -25
  194. data/spec/unit/application/apply_spec.rb +22 -4
  195. data/spec/unit/application/cert_spec.rb +1 -1
  196. data/spec/unit/application/doc_spec.rb +0 -19
  197. data/spec/unit/application/master_spec.rb +1 -1
  198. data/spec/unit/application_spec.rb +2 -12
  199. data/spec/unit/indirector/node/ldap_spec.rb +19 -21
  200. data/spec/unit/indirector/yaml_spec.rb +18 -6
  201. data/spec/unit/network/http/rack/rest_spec.rb +3 -3
  202. data/spec/unit/network/http/webrick/rest_spec.rb +1 -0
  203. data/spec/unit/node/environment_spec.rb +32 -3
  204. data/spec/unit/node/facts_spec.rb +13 -2
  205. data/spec/unit/parameter/value_collection_spec.rb +2 -2
  206. data/spec/unit/parser/ast/leaf_spec.rb +4 -0
  207. data/spec/unit/parser/ast/resource_reference_spec.rb +0 -5
  208. data/spec/unit/parser/ast/resource_spec.rb +7 -0
  209. data/spec/unit/parser/compiler_spec.rb +12 -1
  210. data/spec/unit/parser/files_spec.rb +3 -3
  211. data/spec/unit/parser/functions/extlookup_spec.rb +95 -0
  212. data/spec/unit/parser/functions/include_spec.rb +33 -0
  213. data/spec/unit/parser/functions/require_spec.rb +1 -1
  214. data/spec/unit/parser/functions/tag_spec.rb +1 -0
  215. data/spec/unit/parser/lexer_spec.rb +10 -1
  216. data/spec/unit/parser/resource_spec.rb +3 -9
  217. data/spec/unit/parser/type_loader_spec.rb +1 -1
  218. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +4 -2
  219. data/spec/unit/rails/resource_spec.rb +1 -1
  220. data/spec/unit/reports/tagmail_spec.rb +2 -2
  221. data/spec/unit/resource/catalog_spec.rb +1 -1
  222. data/spec/unit/resource/type_collection_spec.rb +35 -0
  223. data/spec/unit/resource/type_spec.rb +19 -1
  224. data/spec/unit/resource_spec.rb +0 -36
  225. data/spec/unit/simple_graph_spec.rb +12 -2
  226. data/spec/unit/transaction/resource_harness_spec.rb +1 -1
  227. data/spec/unit/type/file/content_spec.rb +2 -1
  228. data/spec/unit/type/schedule_spec.rb +1 -1
  229. data/spec/unit/type/service_spec.rb +8 -0
  230. data/spec/unit/type/user_spec.rb +5 -0
  231. data/spec/unit/util/backups_spec.rb +0 -1
  232. data/spec/unit/util/rdoc/parser_spec.rb +3 -3
  233. data/spec/unit/util/rdoc_spec.rb +13 -0
  234. data/test/certmgr/support.rb +2 -1
  235. data/test/language/parser.rb +6 -6
  236. data/test/lib/puppettest.rb +3 -23
  237. data/test/lib/puppettest/fakes.rb +1 -1
  238. data/test/lib/puppettest/support/assertions.rb +0 -2
  239. data/test/lib/puppettest/support/utils.rb +25 -20
  240. data/test/ral/manager/attributes.rb +4 -1
  241. metadata +15 -9
  242. data/conf/suse/puppet.suse.patch +0 -16
  243. data/ext/extlookup.rb +0 -181
  244. data/ext/puppetlast +0 -16
  245. data/tasks/rake/tracdocs.rake +0 -8
  246. data/test/lib/mocha_standalone.rb +0 -2
data/CHANGELOG CHANGED
@@ -1,5 +1,128 @@
1
+ 2.6.1
2
+ =====
3
+ 14f871d [#4756] addendum for #4756
4
+ 9bdfe69 Fix for Bug #4756 - Providers no longer respect missing features Restored deleted lines from type.rb and reinstated unit tests
5
+ 14b3340 Fix for #4736 -- preserve case of defined resources
6
+ bd973a2 Fix for #4637 --use of namevar missed in refactor
7
+
8
+ 2.6.1rc4
9
+ ========
10
+ efa834a Updated CHANGELOG for 2.6.1rc4
11
+ 763e7cb Minimal fix for #4691 -- class name uppercased in $name
12
+ 4a9c857 Fix for #4693 -- implicit stages should never be serialized
13
+ fa4d32c Fix for #4646 -- Missing stub
14
+ 4d55c6e Fix for tests broken by fix for #4489 -- stub standalone
15
+ b397b69 Fix for #4489 -- apply was using the rest terminus
16
+ e91a8cc [#4462] uncaught Timeout::Error
17
+ 4d36a51 Fixed alias metaparam docs error
18
+ b063635 Skip apt-listbugs and apt-listchanges when installing from puppet
19
+ e860907 [#4660] Avoid passing rake and autotest args to puppet tests
20
+ 419e007 Fixed #4706 - logcheck patterns
21
+ f6c0265 Fixed queue require for #4555
22
+ 07d0be4 [#4308] Remove puppettest from specs
23
+ 9e69616 Fixed RSpec warning messages
24
+ 8d24861 Fixed #4100 - Added http_caching to yumrepo type
25
+ 8cd266e Added cost parameter to the yumrepo type
26
+ 0056d41 Fixed extlookup documentation and spacing
27
+ e783a16 Fix for #4506 -- too much data being serialized
28
+ f59cfc8 Fixed terminus example documentation
29
+ 690465e Fix #4615 - vim highlighting fails on slashes and colons.
30
+ 078e4fd Updated man pages
31
+ 7548c65 Updated Man page generation since move to Markdown
32
+
33
+ 2.6.1rc3
34
+ ========
35
+ 8be1929 Updated CHANGELOG for 2.6.1rc3
36
+ 81a2725 Fix for #4456 -- need to accept some mime-type aliases
37
+ c318558 Fix for #4489 -- apply was using the rest terminus
38
+ 491c31d Fix for #4542 -- included classes weren't assigned proper stages
39
+ 302d657 Fix for #4501 -- reports not generated in standalone
40
+ 1ea4ccf Start server before agent
41
+ 4c28079 [#4555] puppet queue tries to call code it hasn't required
42
+ d1150e0 fix #4528 - treat * as absent
43
+ 20f4b90 Fix for #4518 -- classes not getting added to compiler.classes
44
+ 57bb06b [#4545] Remove obsolete 'trac' specs
45
+ 82b4f04 Maint. -- Fix test failures broken by previous commit
46
+ 0c30754 Maint. Removing code at the request of the original author
47
+ 3df0490 [#4298] Puppet apply prints an error if the file to apply doesn't exist
48
+ 5d4f222 Fixed #4527 correctly for 2.6.1
49
+ 1b3d782 Updated config.ru example for 2.6.1
50
+
51
+ 2.6.1rc2
52
+ ========
53
+ 0aa27b5 Updated for 2.6.1rc2
54
+ 252c9b8 Further RST to Markdown fixes for types, values, tests
55
+ 1157e8d Updated all types to Markdown output
56
+ fef8800 Updated reference output to generate valid Markdown
57
+ 79e0a2e Reformatting documentation from RST to MarkDown (#4509) Signed-off-by: Jes Fraser <jes@gadget.geek.nz>
58
+ 62435e5 Rewrote functions documentation to Markdown
59
+ e4b2aa6 Removed legacy Trac code
60
+ 8ddea2a Maint. Passenger fix broke a test
61
+ f43e87b Fix for #4476 -- rails calling yaml internals
62
+ a23d80a Fixes #4485 -- single quoted strings should not treat \n as new line
63
+ 8e31b52 Passenger needs HTTP headers values to be string
64
+ 037bb32 [#4404] Remove requirement for source on Parser::Resource::Param
65
+ 0e4bc62 [#4364] Fix failing spec due to incorrect loglevel
66
+ 3a6ca54 Fix #4458 - Do not dump the whole environment when instances can't be found
67
+ d909827 Fix for #4465 -- earlier "feature" patch broke ldap
68
+ 47005aa Maint -- tests need to respect RFC-952
69
+ 6aac8f0 [#4467] Make Puppet Master respect facts_terminus settings
70
+ 1cba9a7 added md5 support as requested in http://serverfault.com/questions/166199/puppet-md5-sum-of-string
71
+ 1dfd2b6 [#4381] extlookup shouldn't trigger reparses of .pp files
72
+ be2b1f3 [#4370] Fixes extlookup precedence getting overwritten between runs
73
+ 03808fd Fixed #4364 - Reduced audit msg from info to debug
74
+ 539b57c [#4347] run_mode was colliding with --mode for "puppet doc"
75
+ 1faebdd [#4423] repair parameterized class instantiation
76
+ 37568bd [#4423] class { shouldn't get stored on the namespace stack
77
+ 449315a [#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the AST resources.
78
+ daa801b [#4344] Temporary fix to stop agent from importing modules
79
+ 00ebf01 [#4344] Fix for failing templates when module name matches file in local dir.
80
+ e32320e [#4336] "reportdir" was in the wrong section
81
+ 0f9672a Fixed #4311 - Typo in defaults.rb
82
+ f54d843 Fix #4461 - attempt to fix another performance issue
83
+ 2c21fae Fix for #4300 Solaris svc files need new pid filenames
84
+ 83c2419 [#4284] Fix failing specs run as root due to missing puppet group
85
+ 8237f68 [#4242] Fixed (removed) a broken unit test
86
+ d5ad0fb Removed eventual documentation line ... eventually came
87
+ 871e6fd Fixed #4368 - Updated clean stored configs ext script for new config sections
88
+ cb64477 Updated version to 2.6.1
89
+
90
+ 2.6.1rc1
91
+ ========
92
+ ecf44e4 Updated CHANGELOG for 2.6.1rc1
93
+ bdfcac5 Update Red Hat spec file for 2.6.0
94
+ 9f08e7c Feature: puppet-load - a tool to stress-test master compilation
95
+ ef9a4a6 Fix #4245 - default insertion of ACL is not thread safe
96
+ 4065e81 Fix race condition in rack autoloading of request/response
97
+ 3163932 Fix #4244 - Cached Attributes is not thread safe
98
+ 7d42f77 JRuby doesn't implement Process.maxgroups
99
+ 760e418 Fix #4349 - Parsing with ignoreimport=true was always loading site.pp
100
+ 67bdf89 Fix #4348 - Puppet doc single manifest broken
101
+ 13c71b9 extlookup() is a builtin
102
+ d38e522 [#4333] old optparse doesn't support default_argv=
103
+ 86b0882 Fixed #4326 - Updated SUSE packaging
104
+ 03313b8 Fix #4319 - source file url sent to the master is invalid
105
+ ac3a0d2 vim: highlight default parameters in definition/classes
106
+ be2141a vim: match collected resources.
107
+ c047c8d vim: added elsif
108
+ 9569136 Fix for 4314 -- Need to allow '-' in class name for refs
109
+ 636079f Fixed #4304 - Changed logging level for auto import message
110
+ 000fd1e Fix for #4303 -- reverting to old escaping in '-strings
111
+ 1d494a3 Tweak to fix for #4302--dangling ref to known_resource_types
112
+ 2383050 Fix #4302 - Compilation speed regression compared to 2.6
113
+ 63ec207 Minimal fix for #4297, with notes for follow-up
114
+ 7ad7eb1 Fix #4286 - rename puppetdoc global module <site> to __site__
115
+ 28bb195 Fixed yumrepo type deprecation wanring `
116
+ 067a46d Temporary tweak to tests for #4242
117
+ 9778f2a [#4242] Fixed recursion due to parents including their children
118
+ 59a23d6 Fix for #3382 -- Empty classes as graph placeholders
119
+ 865282a Fixed example config.ru
120
+ a0a63c3 Fixed network and indirection reference
121
+ 64386cf Fixed Indirection reference
122
+
1
123
  2.6.0
2
124
  =====
125
+ db0b30d Updated CHANGELOG for 2.6.0
3
126
  42a475e Fixing #4268 - manifests always imported
4
127
  06fc40c [#4269] Undef variables interpolate to empty string
5
128
  1288f8c [#4270] Force inherited classes to load into the correct environment
@@ -5,14 +5,14 @@
5
5
  %global confdir conf/redhat
6
6
 
7
7
  Name: puppet
8
- Version: 0.25.5
8
+ Version: 2.6.0
9
9
  Release: 1%{?dist}
10
10
  Summary: A network tool for managing many disparate systems
11
11
  License: GPLv2+
12
12
  URL: http://puppetlabs.com
13
13
  Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
14
14
  Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
15
- Patch0: rundir-perms.patch
15
+
16
16
  Group: System Environment/Base
17
17
 
18
18
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,7 @@ The server can also function as a certificate authority and file server.
68
68
  %setup -q
69
69
  patch -p1 < conf/redhat/rundir-perms.patch
70
70
 
71
+
71
72
  %build
72
73
  # Fix some rpmlint complaints
73
74
  for f in mac_dscl.pp mac_dscl_revert.pp \
@@ -91,6 +92,7 @@ rm -rf %{buildroot}
91
92
  ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
92
93
 
93
94
  install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
95
+ install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
94
96
  install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
95
97
  install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
96
98
  install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
@@ -221,6 +223,10 @@ fi
221
223
  rm -rf %{buildroot}
222
224
 
223
225
  %changelog
226
+ * Tue Jul 20 2010 Todd Zullinger <tmz@pobox.com> - 2.6.0-1
227
+ - Update to 2.6.0
228
+ - Create and own /usr/share/puppet/modules (#615432)
229
+
224
230
  * Mon May 03 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
225
231
  - Update to 0.25.5
226
232
  - Adjust selinux conditional for EL-6
@@ -12,7 +12,7 @@ exec_prefix=/opt/csw
12
12
  sysconfdir=/opt/csw/etc
13
13
  sbindir=/opt/csw/sbin
14
14
 
15
- pidfile=/var/lib/puppet/run/puppetd.pid
15
+ pidfile=/var/lib/puppet/run/agent.pid
16
16
 
17
17
  case "$1" in
18
18
  start)
@@ -8,7 +8,7 @@ exec_prefix=/opt/csw
8
8
  sysconfdir=/opt/csw/etc
9
9
  sbindir=/opt/csw/sbin
10
10
 
11
- pidfile=/var/lib/puppet/run/puppetmasterd.pid
11
+ pidfile=/var/lib/puppet/run/master.pid
12
12
 
13
13
  case "$1" in
14
14
  start)
@@ -13,10 +13,10 @@
13
13
 
14
14
  ### BEGIN INIT INFO
15
15
  # Provides: puppet
16
- # Required-Start: $local_fs $network $syslog
17
- # Should-Start: $null
18
- # Required-Stop: $null
19
- # Should-Stop: $null
16
+ # Required-Start: $local_fs $remote_fs $network $syslog
17
+ # Should-Start: puppet
18
+ # Required-Stop: $local_fs $remote_fs $network $syslog
19
+ # Should-Stop: puppet
20
20
  # Default-Start: 3 4 5
21
21
  # Default-Stop: 0 1 2 6
22
22
  # Short-Description: puppet
@@ -0,0 +1,12 @@
1
+ # This file consists of arbitrarily named sections/modules
2
+ # defining where files are served from and to whom
3
+
4
+ # Define a section 'files'
5
+ # Adapt the allow/deny settings to your needs. Order
6
+ # for allow/deny does not matter, allow always takes precedence
7
+ # over deny
8
+ # [files]
9
+ # path /var/lib/puppet/files
10
+ # allow *.example.com
11
+ # deny *.evil.example.com
12
+ # allow 192.168.0.0/24
@@ -0,0 +1,10 @@
1
+ /var/log/puppet/*log {
2
+ missingok
3
+ notifempty
4
+ create 0644 puppet puppet
5
+ sharedscripts
6
+ postrotate
7
+ [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true
8
+ [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
9
+ endscript
10
+ }
@@ -0,0 +1,25 @@
1
+ [main]
2
+ # The Puppet log directory.
3
+ # The default value is '$vardir/log'.
4
+ logdir = /var/log/puppet
5
+
6
+ # Where Puppet PID files are kept.
7
+ # The default value is '$vardir/run'.
8
+ rundir = /var/run/puppet
9
+
10
+ # Where SSL certificates are kept.
11
+ # The default value is '$confdir/ssl'.
12
+ ssldir = $vardir/ssl
13
+
14
+ [agent]
15
+ # The file in which puppetd stores a list of the classes
16
+ # associated with the retrieved configuratiion. Can be loaded in
17
+ # the separate ``puppet`` executable using the ``--loadclasses``
18
+ # option.
19
+ # The default value is '$confdir/classes.txt'.
20
+ classfile = $vardir/classes.txt
21
+
22
+ # Where puppetd caches the local configuration. An
23
+ # extension indicating the cache format is added automatically.
24
+ # The default value is '$confdir/localconfig'.
25
+ localconfig = $vardir/localconfig
@@ -1,31 +1,35 @@
1
1
  %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
2
2
  %define pbuild %{_builddir}/%{name}-%{version}
3
- %define suseconfdir conf/suse
4
- %define confdir conf/redhat
3
+ %define confdir conf/suse
5
4
 
6
5
  Summary: A network tool for managing many disparate systems
7
6
  Name: puppet
8
- Version: 0.25.4
7
+ Version: 2.6.0
9
8
  Release: 1%{?dist}
10
9
  License: GPL
11
- Group: System Environment/Base
10
+ Group: Productivity/Networking/System
12
11
 
13
- URL: http://reductivelabs.com/projects/puppet/
14
- Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
15
- Patch0: puppet.suse.patch
12
+ URL: http://puppetlabs.com/projects/puppet/
13
+ Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
14
+ Source1: client.init
15
+ Source2: server.init
16
+ Patch0: ruby-env.patch
17
+
18
+ PreReq: %{insserv_prereq} %{fillup_prereq}
16
19
  Requires: ruby >= 1.8.2
17
- Requires: facter >= 1.3.7
20
+ Requires: facter >= 1.5
21
+ Requires: cron
18
22
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
19
- BuildRequires: ruby >= 1.8.2
23
+ BuildRequires: ruby >= 1.8.7
20
24
 
21
25
  %description
22
- Puppet lets you centrally manage every important aspect of your system using a
23
- cross-platform specification language that manages all the separate elements
24
- normally aggregated in different files, like users, cron jobs, and hosts,
26
+ Puppet lets you centrally manage every important aspect of your system using a
27
+ cross-platform specification language that manages all the separate elements
28
+ normally aggregated in different files, like users, cron jobs, and hosts,
25
29
  along with obviously discrete elements like packages, services, and files.
26
30
 
27
31
  %package server
28
- Group: System Environment/Base
32
+ Group: Productivity/Networking/System
29
33
  Summary: Server for the puppet system management tool
30
34
  Requires: puppet = %{version}-%{release}
31
35
 
@@ -45,45 +49,47 @@ done
45
49
  %install
46
50
  %{__install} -d -m0755 %{buildroot}%{_sbindir}
47
51
  %{__install} -d -m0755 %{buildroot}%{_bindir}
52
+ %{__install} -d -m0755 %{buildroot}%{_confdir}
48
53
  %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
49
54
  %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
50
55
  %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
51
56
  %{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
52
57
  %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
53
58
  %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
54
- %{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
59
+ %{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_bindir}
55
60
  %{__install} -Dp -m0755 %{pbuild}/sbin/* %{buildroot}%{_sbindir}
56
- %{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
57
- %{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
58
61
  %{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
59
62
  %{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
60
63
  find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
61
- %{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
64
+ %{__cp} -a %{pbuild}/conf/redhat/client.sysconfig %{buildroot}%{_confdir}/client.sysconfig
65
+ %{__install} -Dp -m0644 %{buildroot}%{_confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
62
66
  %{__install} -Dp -m0755 %SOURCE1 %{buildroot}%{_initrddir}/puppet
63
- %{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
67
+ %{__cp} -a %{pbuild}/conf/redhat/server.sysconfig %{buildroot}%{_confdir}/server.sysconfig
68
+ %{__install} -Dp -m0644 %{buildroot}%{_confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
64
69
  %{__install} -Dp -m0755 %SOURCE2 %{buildroot}%{_initrddir}/puppetmaster
65
- %{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
66
- %{__install} -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
67
- #%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
68
- #%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
69
- %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
70
+ %{__cp} -a %{pbuild}/conf/redhat/fileserver.conf %{buildroot}%{_confdir}/fileserver.conf
71
+ %{__install} -Dp -m0644 %{buildroot}%{_confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
72
+ %{__cp} -a %{pbuild}/conf/redhat/puppet.conf %{buildroot}%{_confdir}/puppet.conf
73
+ %{__install} -Dp -m0644 %{buildroot}%{_confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
74
+ %{__cp} -a %{pbuild}/conf/redhat/logrotate %{buildroot}%{_confdir}/logrotate
75
+ %{__install} -Dp -m0644 %{buildroot}%{_confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
70
76
  %{__ln_s} %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet
71
77
  %{__ln_s} %{_initrddir}/puppetmaster %{buildroot}%{_sbindir}/rcpuppetmaster
72
78
 
73
79
  %files
74
80
  %defattr(-, root, root, 0755)
75
81
  %{_bindir}/puppet
76
- %{_sbindir}/filebucket
77
- %{_sbindir}/ralsh
82
+ %{_bindir}/puppetdoc
83
+ %{_bindir}/filebucket
84
+ %{_bindir}/ralsh
85
+ %{_bindir}/pi
78
86
  %{_sbindir}/puppetd
79
87
  %{_sbindir}/rcpuppet
80
- %{_sbindir}/pi
81
88
  %{ruby_sitelibdir}/*
82
89
  %{_initrddir}/puppet
83
90
  /var/adm/fillup-templates/sysconfig.puppet
84
91
  %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
85
92
  %doc CHANGELOG COPYING LICENSE README examples
86
- %exclude %{_sbindir}/puppetdoc
87
93
  %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
88
94
  %dir %{_sysconfdir}/puppet
89
95
  # These need to be owned by puppet so the server can
@@ -95,56 +101,115 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
95
101
  %files server
96
102
  %defattr(-, root, root, 0755)
97
103
  %{_sbindir}/puppetmasterd
104
+ %{_sbindir}/rcpuppetmaster
98
105
  %{_sbindir}/puppetqd
99
- %{_bindir}/puppetrun
106
+ %{_sbindir}/puppetrun
107
+ %{_sbindir}/puppetca
100
108
  %{_initrddir}/puppetmaster
101
109
  %config(noreplace) %{_sysconfdir}/puppet/*
102
- %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
103
- %{_sbindir}/puppetca
110
+ %exclude %{_sysconfdir}/puppet/puppet.conf
111
+ /var/adm/fillup-templates/sysconfig.puppetmaster
112
+ %dir %{_sysconfdir}/puppet
104
113
 
105
114
  %pre
106
115
  /usr/sbin/groupadd -r puppet 2>/dev/null || :
107
116
  /usr/sbin/useradd -g puppet -c "Puppet" \
108
- -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || :
117
+ -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
109
118
 
110
119
  %post
111
- /sbin/chkconfig --add puppet
112
- exit 0
120
+ %{fillup_and_insserv -y puppet}
113
121
 
114
122
  %post server
115
- /sbin/chkconfig --add puppetmaster
123
+ %{fillup_and_insserv -n -y puppetmaster}
116
124
 
117
125
  %preun
118
- if [ "$1" = 0 ] ; then
119
- /sbin/service puppet stop > /dev/null 2>&1
120
- /sbin/chkconfig --del puppet
121
- fi
126
+ %stop_on_removal puppet
122
127
 
123
128
  %preun server
124
- if [ "$1" = 0 ] ; then
125
- /sbin/service puppetmaster stop > /dev/null 2>&1
126
- /sbin/chkconfig --del puppetmaster
127
- fi
129
+ %stop_on_removal puppetmaster
130
+
131
+ %postun
132
+ %restart_on_update puppet
133
+ %{insserv_cleanup}
128
134
 
129
135
  %postun server
130
- if [ "$1" -ge 1 ]; then
131
- /sbin/service puppetmaster try-restart > /dev/null 2>&1
132
- fi
136
+ %restart_on_update puppetmaster
137
+ %{insserv_cleanup}
133
138
 
134
139
  %clean
135
140
  %{__rm} -rf %{buildroot}
136
141
 
137
142
  %changelog
138
- * Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1
139
- - Fixed puppet configuation file references to match single puppet.conf file
140
- - Update versions for 0.24.1 release
143
+ * Wed Jul 21 2010 Ben Kevan <ben.kevan@gmail.com> - 2.6.0
144
+ - New version and ruby version bump
145
+ - Add puppetdoc to %_bindir (unknown why original suse package, excluded or forgot to add)
146
+ - Corrected patch for ruby environment
147
+ - Move binaries back to the correct directories
148
+
149
+ * Wed Jul 14 2010 Ben Kevan <ben.kevan@gmail.com> - 0.25.5
150
+ - New version.
151
+ - Use original client, server.init names
152
+ - Revert to puppetmaster
153
+ - Fixed client.init and server.init and included $null and Should-Stop for both
154
+
155
+ * Tue Mar 2 2010 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.25.4
156
+ - New version.
157
+
158
+ * Sun Aug 9 2009 Noah Fontes <nfontes@transtruct.org>
159
+ - Fix build on SLES 9.
160
+ - Enable puppet and puppet-server services by default.
161
+
162
+ * Sat Aug 8 2009 Noah Fontes <nfontes@transtruct.org>
163
+ - Fix a lot of relevant warnings from rpmlint.
164
+ - Build on OpenSUSE 11.1 correctly.
165
+ - Rename puppetmaster init scripts to puppet-server to correspond to the package name.
166
+
167
+ * Wed Apr 22 2009 Leo Eraly <leo@unstable.be> - 0.24.8
168
+ - New version.
169
+
170
+ * Tue Dec 9 2008 Leo Eraly <leo@unstable.be> - 0.24.6
171
+ - New version.
172
+
173
+ * Fri Sep 5 2008 Leo Eraly <leo@unstable.be> - 0.24.5
174
+ - New version.
175
+
176
+ * Fri Jun 20 2008 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.24.4
177
+ - Removed symlinks to old configuration files
178
+
179
+ * Fri Dec 14 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.24.0
180
+ - New version.
181
+
182
+ * Fri Jun 29 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.23.0
183
+ - New version.
184
+
185
+ * Wed May 2 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.4
186
+ - New version. Includes provider for rug package manager.
187
+
188
+ * Wed Apr 25 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.3
189
+ - New version. Added links /sbin/rcpuppet and /sbin/rcpuppetmaster
190
+
191
+ * Sun Jan 7 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.0
192
+ - version bump
193
+
194
+ * Tue Oct 3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.3-3
195
+ - Made package arch dependant.
196
+
197
+ * Sat Sep 23 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.3-1
198
+ - New version
199
+
200
+ * Sun Sep 17 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.1-1
201
+ - New version
202
+
203
+ * Tue Aug 30 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.0-1
204
+ - New version
205
+ - No need to patch anymore :-), since my changes went into official release.
141
206
 
142
207
  * Tue Aug 3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
143
208
  - Replaced puppet-bin.patch with %build section from David's spec
144
209
 
145
210
  * Tue Aug 1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2
146
211
  - Added supprot for enabling services in SuSE
147
-
212
+
148
213
  * Tue Aug 1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1
149
214
  - New version and support for SuSE
150
215