diff options
| author | mail_redacted_for_web | 2019-05-14 20:47:31 +0100 |
|---|---|---|
| committer | mail_redacted_for_web | 2019-05-14 20:47:31 +0100 |
| commit | 535d94437baa681a2117444bb73c58f6d05727e4 (patch) | |
| tree | 307e56902972d9e1a26a6de2bc74650337276727 | |
| parent | 306107b98b4cbc923ec8e37e8bb8d111101ef5c0 (diff) | |
| parent | a8c6d51264bf5e9d8526283a64d29d0b1f7c16e2 (diff) | |
| download | control-repo-template-535d94437baa681a2117444bb73c58f6d05727e4.tar.bz2 | |
Merge pull request #73 from natemccurdy/site_pp_updates
Update outdated info and links in site.pp comments
| -rw-r--r-- | manifests/site.pp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 7059c8c..11663aa 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,30 +1,29 @@ ## site.pp ## -# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point +# This file (./manifests/site.pp) is the main entry point # used when an agent connects to a master and asks for an updated configuration. +# https://puppet.com/docs/puppet/latest/dirs_manifest.html # # Global objects like filebuckets and resource defaults should go in this file, -# as should the default node definition. (The default node can be omitted -# if you use the console and don't define any other nodes in site.pp. See -# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on -# node definitions.) +# as should the default node definition if you want to use it. ## Active Configurations ## # Disable filebucket by default for all File resources: -#https://docs.puppet.com/pe/2015.3/release_notes.html#filebucket-resource-no-longer-created-by-default +# https://github.com/puppetlabs/docs-archive/blob/master/pe/2015.3/release_notes.markdown#filebucket-resource-no-longer-created-by-default File { backup => false } -# DEFAULT NODE -# Node definitions in this file are merged with node data from the console. See -# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on -# node definitions. +## Node Definitions ## # The default node definition matches any node lacking a more specific node -# definition. If there are no other nodes in this file, classes declared here -# will be included in every node's catalog, *in addition* to any classes -# specified in the console for that node. - +# definition. If there are no other node definitions in this file, classes +# and resources declared in the default node definition will be included in +# every node's catalog. +# +# Note that node definitions in this file are merged with node data from the +# Puppet Enterprise console and External Node Classifiers (ENC's). +# +# For more on node definitions, see: https://puppet.com/docs/puppet/latest/lang_node_definitions.html node default { # This is where you can declare classes for all nodes. # Example: |