puppet 0.25.1 → 0.25.2

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 (198) hide show
  1. data/CHANGELOG +159 -135
  2. data/Rakefile +4 -1
  3. data/conf/gentoo/conf.d/puppetmaster +1 -1
  4. data/conf/osx/createpackage.sh +12 -0
  5. data/conf/osx/preflight +4 -0
  6. data/conf/redhat/puppet.spec +12 -2
  7. data/conf/redhat/server.init +1 -0
  8. data/conf/redhat/server.sysconfig +1 -1
  9. data/ext/ldap/puppet.schema +5 -9
  10. data/ext/puppetlast +2 -1
  11. data/ext/rack/README +2 -2
  12. data/ext/regexp_nodes/classes/databases +2 -0
  13. data/ext/regexp_nodes/classes/webservers +2 -0
  14. data/ext/regexp_nodes/parameters/environment/prod +1 -0
  15. data/ext/regexp_nodes/parameters/environment/qa +3 -0
  16. data/ext/regexp_nodes/regexp_nodes.rb +215 -0
  17. data/lib/puppet.rb +1 -1
  18. data/lib/puppet/agent.rb +2 -2
  19. data/lib/puppet/application/puppet.rb +1 -1
  20. data/lib/puppet/application/puppetd.rb +1 -1
  21. data/lib/puppet/application/puppetdoc.rb +4 -3
  22. data/lib/puppet/application/puppetrun.rb +5 -14
  23. data/lib/puppet/application/ralsh.rb +9 -25
  24. data/lib/puppet/configurer.rb +2 -1
  25. data/lib/puppet/configurer/fact_handler.rb +8 -6
  26. data/lib/puppet/daemon.rb +2 -2
  27. data/lib/puppet/defaults.rb +21 -2
  28. data/lib/puppet/external/pson/common.rb +1 -1
  29. data/lib/puppet/external/pson/pure.rb +3 -3
  30. data/lib/puppet/feature/base.rb +3 -0
  31. data/lib/puppet/feature/selinux.rb +3 -0
  32. data/lib/puppet/feature/zlib.rb +6 -0
  33. data/lib/puppet/file_serving/base.rb +16 -1
  34. data/lib/puppet/file_serving/metadata.rb +46 -9
  35. data/lib/puppet/file_serving/mount/file.rb +4 -1
  36. data/lib/puppet/indirector/catalog/active_record.rb +5 -0
  37. data/lib/puppet/indirector/envelope.rb +1 -3
  38. data/lib/puppet/indirector/indirection.rb +13 -16
  39. data/lib/puppet/indirector/node/ldap.rb +7 -4
  40. data/lib/puppet/indirector/ssl_file.rb +1 -1
  41. data/lib/puppet/network/authstore.rb +48 -118
  42. data/lib/puppet/network/client/resource.rb +2 -15
  43. data/lib/puppet/network/format.rb +2 -12
  44. data/lib/puppet/network/format_handler.rb +15 -1
  45. data/lib/puppet/network/formats.rb +19 -4
  46. data/lib/puppet/network/handler/fileserver.rb +1 -0
  47. data/lib/puppet/network/http/handler.rb +1 -0
  48. data/lib/puppet/network/http/rack/httphandler.rb +0 -18
  49. data/lib/puppet/network/http/rack/rest.rb +4 -4
  50. data/lib/puppet/network/http/rack/xmlrpc.rb +4 -4
  51. data/lib/puppet/network/http/webrick.rb +2 -1
  52. data/lib/puppet/network/server.rb +1 -1
  53. data/lib/puppet/node/environment.rb +20 -9
  54. data/lib/puppet/parameter.rb +17 -1
  55. data/lib/puppet/parser/ast/boolean_operator.rb +2 -2
  56. data/lib/puppet/parser/ast/leaf.rb +5 -1
  57. data/lib/puppet/parser/ast/resourceparam.rb +4 -0
  58. data/lib/puppet/parser/ast/selector.rb +4 -0
  59. data/lib/puppet/parser/functions/generate.rb +2 -2
  60. data/lib/puppet/parser/functions/shellquote.rb +1 -1
  61. data/lib/puppet/property.rb +3 -11
  62. data/lib/puppet/provider/cron/crontab.rb +2 -0
  63. data/lib/puppet/provider/host/parsed.rb +9 -9
  64. data/lib/puppet/provider/package/blastwave.rb +7 -6
  65. data/lib/puppet/provider/package/portage.rb +23 -27
  66. data/lib/puppet/provider/package/rug.rb +1 -1
  67. data/lib/puppet/provider/package/sun.rb +5 -3
  68. data/lib/puppet/provider/service/daemontools.rb +1 -1
  69. data/lib/puppet/provider/service/debian.rb +1 -1
  70. data/lib/puppet/provider/service/runit.rb +1 -1
  71. data/lib/puppet/provider/ssh_authorized_key/parsed.rb +2 -1
  72. data/lib/puppet/provider/sshkey/parsed.rb +3 -5
  73. data/lib/puppet/provider/zone/solaris.rb +1 -1
  74. data/lib/puppet/rails.rb +9 -2
  75. data/lib/puppet/rails/benchmark.rb +1 -1
  76. data/lib/puppet/rails/host.rb +2 -7
  77. data/lib/puppet/rails/resource.rb +20 -26
  78. data/lib/puppet/resource/catalog.rb +3 -3
  79. data/lib/puppet/resource/reference.rb +13 -25
  80. data/lib/puppet/ssl/certificate.rb +3 -2
  81. data/lib/puppet/ssl/host.rb +14 -33
  82. data/lib/puppet/sslcertificates.rb +1 -5
  83. data/lib/puppet/sslcertificates/ca.rb +8 -7
  84. data/lib/puppet/transaction.rb +15 -12
  85. data/lib/puppet/type.rb +12 -5
  86. data/lib/puppet/type/file.rb +26 -32
  87. data/lib/puppet/type/file/content.rb +5 -5
  88. data/lib/puppet/type/file/ensure.rb +6 -17
  89. data/lib/puppet/type/file/mode.rb +18 -1
  90. data/lib/puppet/type/file/source.rb +12 -12
  91. data/lib/puppet/type/host.rb +6 -9
  92. data/lib/puppet/type/k5login.rb +1 -1
  93. data/lib/puppet/type/maillist.rb +4 -7
  94. data/lib/puppet/type/port.rb +6 -5
  95. data/lib/puppet/type/resources.rb +12 -12
  96. data/lib/puppet/type/sshkey.rb +5 -5
  97. data/lib/puppet/type/tidy.rb +9 -2
  98. data/lib/puppet/type/yumrepo.rb +3 -1
  99. data/lib/puppet/util.rb +64 -56
  100. data/lib/puppet/util/backups.rb +2 -1
  101. data/lib/puppet/util/filetype.rb +46 -0
  102. data/lib/puppet/util/log.rb +10 -18
  103. data/lib/puppet/util/log_paths.rb +14 -0
  104. data/lib/puppet/util/methodhelper.rb +3 -4
  105. data/lib/puppet/util/monkey_patches.rb +8 -0
  106. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +5 -3
  107. data/lib/puppet/util/rdoc/parser.rb +32 -16
  108. data/lib/puppet/util/reference.rb +6 -3
  109. data/lib/puppet/util/selinux.rb +21 -14
  110. data/lib/puppet/util/settings.rb +30 -25
  111. data/lib/puppet/util/settings/file_setting.rb +7 -4
  112. data/lib/puppet/util/subclass_loader.rb +1 -1
  113. data/lib/puppet/util/suidmanager.rb +11 -1
  114. data/lib/puppet/util/tagging.rb +22 -4
  115. data/man/man8/filebucket.8 +23 -18
  116. data/man/man8/pi.8 +42 -20
  117. data/man/man8/puppet.8 +47 -32
  118. data/man/man8/puppet.conf.8 +807 -764
  119. data/man/man8/puppetca.8 +24 -14
  120. data/man/man8/puppetd.8 +33 -16
  121. data/man/man8/puppetdoc.8 +71 -18
  122. data/man/man8/puppetmasterd.8 +18 -25
  123. data/man/man8/puppetqd.8 +60 -0
  124. data/man/man8/puppetrun.8 +27 -14
  125. data/man/man8/ralsh.8 +33 -40
  126. data/spec/integration/bin/puppetmasterd.rb +3 -2
  127. data/spec/integration/defaults.rb +11 -0
  128. data/spec/integration/file_serving/metadata.rb +1 -0
  129. data/spec/integration/indirector/file_content/file_server.rb +2 -1
  130. data/spec/integration/ssl/certificate_request.rb +2 -0
  131. data/spec/integration/type/file.rb +20 -1
  132. data/spec/shared_behaviours/file_serving.rb +1 -1
  133. data/spec/spec_helper.rb +1 -1
  134. data/spec/unit/application/puppet.rb +11 -30
  135. data/spec/unit/application/puppetd.rb +1 -0
  136. data/spec/unit/application/puppetdoc.rb +13 -4
  137. data/spec/unit/application/puppetmasterd.rb +1 -0
  138. data/spec/unit/application/puppetrun.rb +12 -2
  139. data/spec/unit/application/ralsh.rb +39 -22
  140. data/spec/unit/configurer.rb +6 -0
  141. data/spec/unit/configurer/fact_handler.rb +15 -1
  142. data/spec/unit/file_serving/metadata.rb +128 -16
  143. data/spec/unit/file_serving/mount/file.rb +8 -0
  144. data/spec/unit/indirector/catalog/active_record.rb +20 -1
  145. data/spec/unit/indirector/catalog/compiler.rb +2 -1
  146. data/spec/unit/indirector/indirection.rb +29 -18
  147. data/spec/unit/indirector/node/ldap.rb +20 -6
  148. data/spec/unit/network/authstore.rb +197 -0
  149. data/spec/unit/network/format_handler.rb +28 -8
  150. data/spec/unit/network/formats.rb +31 -0
  151. data/spec/unit/network/http/handler.rb +10 -0
  152. data/spec/unit/network/http/webrick.rb +2 -2
  153. data/spec/unit/network/rest_authconfig.rb +2 -2
  154. data/spec/unit/network/rights.rb +1 -1
  155. data/spec/unit/node/environment.rb +39 -23
  156. data/spec/unit/other/selinux.rb +2 -2
  157. data/spec/unit/parameter.rb +8 -0
  158. data/spec/unit/parser/ast/leaf.rb +9 -0
  159. data/spec/unit/parser/ast/selector.rb +8 -1
  160. data/spec/unit/parser/lexer.rb +1 -1
  161. data/spec/unit/parser/resource.rb +11 -0
  162. data/spec/unit/parser/resource/reference.rb +13 -1
  163. data/spec/unit/property.rb +6 -0
  164. data/spec/unit/provider/mount/parsed.rb +3 -1
  165. data/spec/unit/provider/service/debian.rb +1 -1
  166. data/spec/unit/provider/ssh_authorized_key/parsed.rb +9 -1
  167. data/spec/unit/provider/sshkey/parsed.rb +19 -0
  168. data/spec/unit/rails.rb +22 -9
  169. data/spec/unit/rails/resource.rb +20 -0
  170. data/spec/unit/ssl/host.rb +19 -57
  171. data/spec/unit/transaction.rb +39 -4
  172. data/spec/unit/type.rb +9 -0
  173. data/spec/unit/type/file/content.rb +29 -0
  174. data/spec/unit/type/maillist.rb +42 -0
  175. data/spec/unit/type/resources.rb +66 -1
  176. data/spec/unit/type/tidy.rb +14 -1
  177. data/spec/unit/util/autoload.rb +2 -0
  178. data/spec/unit/util/ldap/connection.rb +1 -1
  179. data/spec/unit/util/log.rb +14 -0
  180. data/spec/unit/util/monkey_patches.rb +103 -0
  181. data/spec/unit/util/queue.rb +10 -2
  182. data/spec/unit/util/selinux.rb +61 -2
  183. data/spec/unit/util/settings.rb +19 -0
  184. data/spec/unit/util/settings/file_setting.rb +25 -0
  185. data/spec/unit/util/tagging.rb +10 -0
  186. data/tasks/rake/changelog.rake +15 -0
  187. data/tasks/rake/ci.rake +22 -0
  188. data/tasks/rake/dailybuild.rake +9 -0
  189. data/tasks/rake/gem.rake +46 -0
  190. data/tasks/rake/git_workflow.rake +121 -0
  191. data/tasks/rake/metrics.rake +6 -0
  192. data/tasks/rake/sign.rake +14 -0
  193. data/tasks/rake/testbranch.rake +16 -0
  194. data/tasks/rake/tracdocs.rake +8 -0
  195. data/test/data/providers/ssh_authorized_key/parsed/authorized_keys +1 -0
  196. metadata +1042 -1288
  197. data/ext/bin/sleeper +0 -67
  198. data/ext/module_puppet +0 -209
@@ -1,7 +1,6 @@
1
1
  .TH "" "" ""
2
2
  .SH NAME
3
- \-
4
-
3
+ \-
5
4
  .\" Man page generated from reStructeredText.
6
5
 
7
6
  .SH SYNOPSIS
@@ -10,16 +9,18 @@ but mostly meant for signing certificate requests from puppet clients.
10
9
 
11
10
 
12
11
  .SH USAGE
13
-
14
- .\" visit_block_quote
12
+ .INDENT 0.0
13
+ .INDENT 3.5
14
+ .INDENT 0.0
15
15
 
16
16
  .TP
17
17
  .B puppetca [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose]
18
18
  [\-g|\-\-generate] [\-l|\-\-list] [\-s|\-\-sign] [\-r|\-\-revoke]
19
19
  [\-p|\-\-print] [\-c|\-\-clean] [\-\-verify] [host]
20
20
 
21
-
22
- .\" depart_block_quote
21
+ .UNINDENT
22
+ .UNINDENT
23
+ .UNINDENT
23
24
 
24
25
  .SH DESCRIPTION
25
26
  Because the puppetmasterd daemon defaults to not signing client
@@ -35,11 +36,12 @@ configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
35
36
  argument.
36
37
 
37
38
  See the configuration file documentation at
38
- http://reductivelabs.com/projects/puppet/reference/configref.html for
39
+ \fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for
39
40
  the full list of acceptable parameters. A commented list of all
40
41
  configuration options can also be generated by running puppetca with
41
42
  \'\-\-genconfig\'.
42
43
 
44
+ .INDENT 0.0
43
45
 
44
46
  .TP
45
47
  .B all: Operate on all items. Currently only makes sense with
@@ -55,24 +57,31 @@ certificate of the host remains valid. If \'\-\-all\' is specified
55
57
  then all host certificates, both signed and unsigned, will be
56
58
  removed.
57
59
 
60
+ .UNINDENT
58
61
  debug: Enable full debugging.
59
62
 
63
+ .INDENT 0.0
60
64
 
61
65
  .TP
62
66
  .B generate: Generate a certificate for a named client. A
63
67
  certificate/keypair will be generated for each client named on
64
68
  the command line.
65
69
 
70
+ .UNINDENT
66
71
  help: Print this help message
67
72
 
73
+ .INDENT 0.0
68
74
 
69
75
  .TP
70
76
  .B list: List outstanding certificate requests. If \'\-\-all\' is
71
77
  specified, signed certificates are also listed, prefixed by
72
- \'+\'.
78
+ \'+\', and revoked or invalid certificates are prefixed by \'\-\'
79
+ (the verification outcome is printed in parenthesis).
73
80
 
81
+ .UNINDENT
74
82
  print: Print the full\-text version of a host\'s certificate.
75
83
 
84
+ .INDENT 0.0
76
85
 
77
86
  .TP
78
87
  .B revoke: Revoke the certificate of a client. The certificate can be
@@ -88,6 +97,7 @@ after revoking certificates.
88
97
  .B sign: Sign an outstanding certificate request. Unless \'\-\-all\' is
89
98
  specified, hosts must be listed after all flags.
90
99
 
100
+ .UNINDENT
91
101
  verbose: Enable verbosity.
92
102
 
93
103
  version: Print the puppet version number and exit.
@@ -96,14 +106,14 @@ verify: Verify the named certificate against the local CA certificate.
96
106
 
97
107
 
98
108
  .SH EXAMPLE
99
-
100
- .\" visit_block_quote
109
+ .INDENT 0.0
110
+ .INDENT 3.5
101
111
  $ puppetca \-l
102
112
  culain.madstop.com
103
113
  $ puppetca \-s culain.madstop.com
104
114
 
105
-
106
- .\" depart_block_quote
115
+ .UNINDENT
116
+ .UNINDENT
107
117
 
108
118
  .SH AUTHOR
109
119
  Luke Kanies
@@ -114,5 +124,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
114
124
  License
115
125
 
116
126
 
117
- .\" Generated by docutils manpage writer on 2008-05-05 09:33.
118
- .\"
127
+ .\" Generated by docutils manpage writer on 2009-12-30 19:31.
128
+ .\"
@@ -1,7 +1,6 @@
1
1
  .TH Synopsis "" "" ""
2
2
  .SH NAME
3
- Synopsis \-
4
-
3
+ Synopsis \-
5
4
  .\" Man page generated from reStructeredText.
6
5
  Retrieve the client configuration from the central puppet server and
7
6
  apply it to the local host.
@@ -10,17 +9,19 @@ Currently must be run out periodically, using cron or something similar.
10
9
 
11
10
 
12
11
  .SH USAGE
13
-
14
- .\" visit_block_quote
12
+ .INDENT 0.0
13
+ .INDENT 3.5
14
+ .INDENT 0.0
15
15
 
16
16
  .TP
17
17
  .B puppetd [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-disable] [\-\-enable]
18
18
  [\-h|\-\-help] [\-\-fqdn <host name>] [\-l|\-\-logdest syslog|<file>|console]
19
- [\-o|\-\-onetime] [\-\-serve <handler>] [\-t|\-\-test]
19
+ [\-o|\-\-onetime] [\-\-serve <handler>] [\-t|\-\-test] [\-\-noop]
20
20
  [\-V|\-\-version] [\-v|\-\-verbose] [\-w|\-\-waitforcert <seconds>]
21
21
 
22
-
23
- .\" depart_block_quote
22
+ .UNINDENT
23
+ .UNINDENT
24
+ .UNINDENT
24
25
 
25
26
  .SH DESCRIPTION
26
27
  This is the main puppet client. Its job is to retrieve the local
@@ -68,8 +69,8 @@ configuration parameter, so you can specify \'\-\-server <servername>\' as
68
69
  an argument.
69
70
 
70
71
  See the configuration file documentation at
71
- http://reductivelabs.com/projects/puppet/reference/configref.html for
72
- the full list of acceptable parameters. A commented list of all
72
+ \fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
73
+ full list of acceptable parameters. A commented list of all
73
74
  configuration options can also be generated by running puppetd with
74
75
  \'\-\-genconfig\'.
75
76
 
@@ -79,6 +80,7 @@ no\-daemonize: Do not send the process into the background.
79
80
 
80
81
  debug: Enable full debugging.
81
82
 
83
+ .INDENT 0.0
82
84
 
83
85
  .TP
84
86
  .B disable: Disable working on the local system. This puts a lock file
@@ -88,11 +90,13 @@ testing a configuration and do not want the central
88
90
  configuration to override the local state until everything
89
91
  is tested and committed.
90
92
 
93
+ .UNINDENT
91
94
  +puppetd+ uses the same lock file while it is running, so no more than
92
95
  one +puppetd+ process is working at a time.
93
96
 
94
97
  +puppetd+ exits after executing this.
95
98
 
99
+ .INDENT 0.0
96
100
 
97
101
  .TP
98
102
  .B enable: Enable working on the local system. This removes any lock
@@ -100,8 +104,10 @@ file, causing +puppetd+ to start managing the local system
100
104
  again (although it will continue to use its normal
101
105
  scheduling, so it might not start for another half hour).
102
106
 
107
+ .UNINDENT
103
108
  +puppetd+ exits after executing this.
104
109
 
110
+ .INDENT 0.0
105
111
 
106
112
  .TP
107
113
  .B fqdn: Set the fully\-qualified domain name of the client. This is
@@ -109,8 +115,10 @@ only used for certificate purposes, but can be used to
109
115
  override the discovered hostname. If you need to use this
110
116
  flag, it is generally an indication of a setup problem.
111
117
 
118
+ .UNINDENT
112
119
  help: Print this help message
113
120
 
121
+ .INDENT 0.0
114
122
 
115
123
  .TP
116
124
  .B logdest: Where to send messages. Choose between syslog, the
@@ -145,13 +153,21 @@ exactly, both in the call to +serve+ and in
145
153
 
146
154
  .TP
147
155
  .B test: Enable the most common options used for testing. These are
148
- +onetime+, +verbose+, +ignorecache, and
156
+ +onetime+, +verbose+, +ignorecache, +no\-daemonize+, and
149
157
  +no\-usecacheonfailure+.
150
158
 
159
+
160
+ .TP
161
+ .B noop: Use +noop+ mode where the daemon runs in a no\-op or
162
+ dry\-run mode. This is useful for seeing what changes
163
+ Puppet will make without actually executing the changes.
164
+
165
+ .UNINDENT
151
166
  verbose: Turn on verbose reporting.
152
167
 
153
168
  version: Print the puppet version number and exit.
154
169
 
170
+ .INDENT 0.0
155
171
 
156
172
  .TP
157
173
  .B waitforcert: This option only matters for daemons that do not yet have
@@ -162,14 +178,15 @@ request. This is useful for the initial setup of a puppet
162
178
  client. You can turn off waiting for certificates by
163
179
  specifying a time of 0.
164
180
 
181
+ .UNINDENT
165
182
 
166
183
  .SH EXAMPLE
167
-
168
- .\" visit_block_quote
184
+ .INDENT 0.0
185
+ .INDENT 3.5
169
186
  puppetd \-\-server puppet.domain.com
170
187
 
171
-
172
- .\" depart_block_quote
188
+ .UNINDENT
189
+ .UNINDENT
173
190
 
174
191
  .SH AUTHOR
175
192
  Luke Kanies
@@ -180,5 +197,5 @@ Copyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU
180
197
  Public License
181
198
 
182
199
 
183
- .\" Generated by docutils manpage writer on 2008-05-05 09:33.
184
- .\"
200
+ .\" Generated by docutils manpage writer on 2009-12-30 19:31.
201
+ .\"
@@ -1,7 +1,6 @@
1
1
  .TH "" "" ""
2
2
  .SH NAME
3
- \-
4
-
3
+ \-
5
4
  .\" Man page generated from reStructeredText.
6
5
 
7
6
  .SH SYNOPSIS
@@ -10,44 +9,98 @@ Reductive Labs use.
10
9
 
11
10
 
12
11
  .SH USAGE
12
+ .INDENT 0.0
13
+ .INDENT 3.5
14
+ .INDENT 0.0
13
15
 
14
- .\" visit_block_quote
15
- puppetdoc [\-a|\-\-all] [\-h|\-\-help] [\-m|\-\-mode <text|pdf|trac> [\-r|\-\-reference <[type]|configuration|..>]
16
-
16
+ .TP
17
+ .B puppetdoc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir <rdoc outputdir>] [\-m|\-\-mode <text|pdf|markdown|trac|rdoc>]
18
+ [\-r|\-\-reference <[type]|configuration|..>] [manifest\-file]
17
19
 
18
- .\" depart_block_quote
20
+ .UNINDENT
21
+ .UNINDENT
22
+ .UNINDENT
19
23
 
20
24
  .SH DESCRIPTION
21
- This command generates a restructured\-text document describing all
22
- installed Puppet types or all allowable arguments to puppet executables.
23
- It is largely meant for internal use and is used to generate the
24
- reference document available on the Reductive Labs web site.
25
+ If mode is not \'rdoc\', then this command generates a restructured\-text
26
+ document describing all installed Puppet types or all allowable
27
+ arguments to puppet executables. It is largely meant for internal use
28
+ and is used to generate the reference document available on the
29
+ Reductive Labs web site.
30
+
31
+ In \'rdoc\' mode, this command generates an html RDoc hierarchy describing
32
+ the manifests that are in \'manifestdir\' and \'modulepath\' configuration
33
+ directives. The generated documentation directory is doc by default but
34
+ can be changed with the \'outputdir\' option.
35
+
36
+ If the command is started with \'manifest\-file\' command\-line arguments,
37
+ puppetdoc generate a single manifest documentation that is output on
38
+ stdout.
25
39
 
26
40
 
27
41
  .SH OPTIONS
28
- all: Output the docs for all of the reference types.
42
+ .INDENT 0.0
43
+
44
+ .TP
45
+ .B all: Output the docs for all of the reference types. In \'rdoc\'
46
+ modes, this also outputs documentation for all resources
29
47
 
48
+ .UNINDENT
30
49
  help: Print this help message
31
50
 
51
+ .INDENT 0.0
52
+
53
+ .TP
54
+ .B outputdir: Specifies the directory where to output the rdoc
55
+ documentation in \'rdoc\' mode.
56
+
32
57
 
33
58
  .TP
34
59
  .B mode: Determine the output mode. Valid modes are \'text\', \'trac\',
35
- and \'pdf\'. Note that \'trac\' mode only works on Reductive Labs
36
- servers. The default mode is \'text\'.
60
+ \'pdf\', \'markdown\' and \'rdoc\'. The \'pdf\' and \'markdown\' modes
61
+ create PDF or Markdown formatted files in the /tmp directory.
62
+ Note that \'trac\' mode only works on Reductive Labs servers.
63
+ The default mode is \'text\'. In \'rdoc\' mode you must provide
64
+ \'manifests\-path\'
37
65
 
38
66
 
39
67
  .TP
40
68
  .B reference: Build a particular reference. Get a list of references by
41
69
  running +puppetdoc \-\-list+.
42
70
 
71
+ .UNINDENT
43
72
 
44
73
  .SH EXAMPLE
45
-
46
- .\" visit_block_quote
74
+ .INDENT 0.0
75
+ .INDENT 3.5
47
76
  $ puppetdoc \-r type > /tmp/type_reference.rst
48
77
 
78
+ .UNINDENT
79
+ .UNINDENT
80
+ or
81
+
82
+ .INDENT 0.0
83
+ .INDENT 3.5
84
+ $ puppetdoc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
85
+
86
+ .UNINDENT
87
+ .UNINDENT
88
+ or
89
+
90
+ .INDENT 0.0
91
+ .INDENT 3.5
92
+ $ puppetdoc /etc/puppet/manifests/site.pp
93
+
94
+ .UNINDENT
95
+ .UNINDENT
96
+ or
97
+
98
+ .INDENT 0.0
99
+ .INDENT 3.5
100
+ $ puppetdoc \-m markdown \-r configuration
49
101
 
50
- .\" depart_block_quote
102
+ .UNINDENT
103
+ .UNINDENT
51
104
 
52
105
  .SH AUTHOR
53
106
  Luke Kanies
@@ -58,5 +111,5 @@ Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
58
111
  Public License
59
112
 
60
113
 
61
- .\" Generated by docutils manpage writer on 2008-05-05 09:33.
62
- .\"
114
+ .\" Generated by docutils manpage writer on 2009-12-30 19:24.
115
+ .\"
@@ -1,7 +1,6 @@
1
1
  .TH "" "" ""
2
2
  .SH NAME
3
- \-
4
-
3
+ \-
5
4
  .\" Man page generated from reStructeredText.
6
5
 
7
6
  .SH SYNOPSIS
@@ -10,16 +9,17 @@ default.
10
9
 
11
10
 
12
11
  .SH USAGE
13
-
14
- .\" visit_block_quote
12
+ .INDENT 0.0
13
+ .INDENT 3.5
14
+ .INDENT 0.0
15
15
 
16
16
  .TP
17
17
  .B puppetmasterd [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help]
18
- [\-l|\-\-logdest <file>|console|syslog] [\-\-nobucket] [\-\-nonodes]
19
- [\-v|\-\-verbose] [\-V|\-\-version]
20
-
18
+ [\-l|\-\-logdest <file>|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version]
21
19
 
22
- .\" depart_block_quote
20
+ .UNINDENT
21
+ .UNINDENT
22
+ .UNINDENT
23
23
 
24
24
  .SH DESCRIPTION
25
25
  This is the puppet central daemon.
@@ -32,8 +32,8 @@ configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
32
32
  argument.
33
33
 
34
34
  See the configuration file documentation at
35
- http://reductivelabs.com/projects/puppet/reference/configref.html for
36
- the full list of acceptable parameters. A commented list of all
35
+ \fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
36
+ full list of acceptable parameters. A commented list of all
37
37
  configuration options can also be generated by running puppetmasterdd
38
38
  with \'\-\-genconfig\'.
39
39
 
@@ -45,6 +45,7 @@ debug: Enable full debugging.
45
45
 
46
46
  help: Print this help message.
47
47
 
48
+ .INDENT 0.0
48
49
 
49
50
  .TP
50
51
  .B logdest: Where to send messages. Choose between syslog, the
@@ -52,27 +53,19 @@ console, and a log file. Defaults to sending messages to
52
53
  syslog, or the console if debugging or verbosity is
53
54
  enabled.
54
55
 
55
- nobucket: Do not function as a file bucket.
56
-
57
-
58
- .TP
59
- .B nonodes: Do not use individual node designations; each node will
60
- receive the result of evaluating the entire configuration.
61
-
62
- noreports: Do not start the reports server.
63
-
56
+ .UNINDENT
64
57
  verbose: Enable verbosity.
65
58
 
66
59
  version: Print the puppet version number and exit.
67
60
 
68
61
 
69
62
  .SH EXAMPLE
70
-
71
- .\" visit_block_quote
63
+ .INDENT 0.0
64
+ .INDENT 3.5
72
65
  puppetmasterd
73
66
 
74
-
75
- .\" depart_block_quote
67
+ .UNINDENT
68
+ .UNINDENT
76
69
 
77
70
  .SH AUTHOR
78
71
  Luke Kanies
@@ -83,5 +76,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
83
76
  License
84
77
 
85
78
 
86
- .\" Generated by docutils manpage writer on 2008-05-05 09:33.
87
- .\"
79
+ .\" Generated by docutils manpage writer on 2009-12-30 19:31.
80
+ .\"