Skip to content

Commit a8c6d51

Browse files
committed
Update outdated info and links in site.pp comments
This commit attempts to cleanup and modernize the comments in site.pp a bit. For one thing, I've updated the docs links to point to working URL's. For another, I tried to reorganize, clarify, and deduplicate the comments.
1 parent 306107b commit a8c6d51

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

manifests/site.pp

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
## site.pp ##
22

3-
# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
3+
# This file (./manifests/site.pp) is the main entry point
44
# used when an agent connects to a master and asks for an updated configuration.
5+
# https://puppet.com/docs/puppet/latest/dirs_manifest.html
56
#
67
# Global objects like filebuckets and resource defaults should go in this file,
7-
# as should the default node definition. (The default node can be omitted
8-
# if you use the console and don't define any other nodes in site.pp. See
9-
# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
10-
# node definitions.)
8+
# as should the default node definition if you want to use it.
119

1210
## Active Configurations ##
1311

1412
# Disable filebucket by default for all File resources:
15-
#https://docs.puppet.com/pe/2015.3/release_notes.html#filebucket-resource-no-longer-created-by-default
13+
# https://github.com/puppetlabs/docs-archive/blob/master/pe/2015.3/release_notes.markdown#filebucket-resource-no-longer-created-by-default
1614
File { backup => false }
1715

18-
# DEFAULT NODE
19-
# Node definitions in this file are merged with node data from the console. See
20-
# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
21-
# node definitions.
16+
## Node Definitions ##
2217

2318
# The default node definition matches any node lacking a more specific node
24-
# definition. If there are no other nodes in this file, classes declared here
25-
# will be included in every node's catalog, *in addition* to any classes
26-
# specified in the console for that node.
27-
19+
# definition. If there are no other node definitions in this file, classes
20+
# and resources declared in the default node definition will be included in
21+
# every node's catalog.
22+
#
23+
# Note that node definitions in this file are merged with node data from the
24+
# Puppet Enterprise console and External Node Classifiers (ENC's).
25+
#
26+
# For more on node definitions, see: https://puppet.com/docs/puppet/latest/lang_node_definitions.html
2827
node default {
2928
# This is where you can declare classes for all nodes.
3029
# Example:

0 commit comments

Comments
 (0)