diff options
| -rw-r--r-- | CODEOWNERS | 1 | ||||
| -rw-r--r-- | Puppetfile | 14 | ||||
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | environment.conf | 4 | ||||
| -rw-r--r-- | hiera.yaml | 4 | ||||
| -rw-r--r-- | manifests/site.pp | 27 | ||||
| -rw-r--r-- | site-modules/profile/manifests/base.pp (renamed from site/profile/manifests/base.pp) | 0 | ||||
| -rw-r--r-- | site-modules/profile/manifests/example.pp (renamed from site/profile/manifests/example.pp) | 0 | ||||
| -rw-r--r-- | site-modules/role/manifests/database_server.pp (renamed from site/role/manifests/database_server.pp) | 0 | ||||
| -rw-r--r-- | site-modules/role/manifests/example.pp (renamed from site/role/manifests/example.pp) | 0 | ||||
| -rw-r--r-- | site-modules/role/manifests/webserver.pp (renamed from site/role/manifests/webserver.pp) | 0 |
11 files changed, 31 insertions, 31 deletions
diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..d5aef52 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @cs-arch @@ -2,16 +2,16 @@ forge 'https://forge.puppet.com' # Modules from the Puppet Forge # Versions should be updated to be the latest at the time you start -#mod 'puppetlabs/inifile', '2.2.1' -#mod 'puppetlabs/stdlib', '4.25.1' -#mod 'puppetlabs/concat', '4.2.1' +#mod 'puppetlabs/inifile', '3.0.0' +#mod 'puppetlabs/stdlib', '6.0.0' +#mod 'puppetlabs/concat', '6.0.0' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples #mod 'apache', -# :git => 'https://github.com/puppetlabs/puppetlabs-apache', -# :commit => 'de290646f97e04b4b8e42c70f6e01e860c394ce7' +# git: 'https://github.com/puppetlabs/puppetlabs-apache', +# commit: '1b6f89afdde0df7f9433a163d5c4b5328eac5779' #mod 'apache', -# :git => 'https://github.com/puppetlabs/puppetlabs-apache', -# :branch => 'docs_experiment' +# git: 'https://github.com/puppetlabs/puppetlabs-apache', +# branch: 'docs_experiment' @@ -19,9 +19,9 @@ The important files and items in this template are as follows: * An example Hiera configuration file and data directory with pre-created common.yaml and nodes directory. * These match the default hierarchy that ships with PE. * An [environment.conf](https://puppet.com/docs/puppet/5.3/config_file_environment.html) that correctly implements: - * A site directory for roles, profiles, and any custom modules for your organization. - * A config_version script. -* An example [config_version](https://puppet.com/docs/puppet/5.3/config_file_environment.html#configversion) script that outputs the git commit ID of the code that was used during a Puppet run. + * A site-modules directory for roles, profiles, and any custom modules for your organization. + * A config\_version script. +* An example [config\_version](https://puppet.com/docs/puppet/5.3/config_file_environment.html#configversion) script that outputs the git commit ID of the code that was used during a Puppet run. Here's a visual representation of the structure of this repository: @@ -36,13 +36,13 @@ control-repo/ │ ├── code_manager_config_version.rb # A config_version script for Code Manager. │ ├── config_version.rb # A config_version script for r10k. │ └── config_version.sh # A wrapper that chooses the appropriate config_version script. -├── site/ # This directory contains site-specific modules and is added to $modulepath. +├── site-modules/ # This directory contains site-specific modules and is added to $modulepath. │ ├── profile/ # The profile module. │ └── role/ # The role module. ├── LICENSE ├── Puppetfile # A list of external Puppet modules to deploy with an environment. ├── README.md -├── environment.conf # Environment-specific settings. Configures the moduelpath and config_version. +├── environment.conf # Environment-specific settings. Configures the modulepath and config_version. └── hiera.yaml # Hiera's configuration file. The Hiera hierarchy is defined here. ``` @@ -113,7 +113,7 @@ To get started with using the control-repo template in your own environment and ## Code Manager Setup -If you use Puppet Enterprise and have not yet enabled and configured Code Manager, in addition to reading the official [documentation](https://puppet.com/docs/pe/latest/code_management/code_mgr.html) for enabling it, you may want to look at the Ramp-Up Program's control repository instead of this one. It's similar to this repo except that it has batteries includes, so to speak. There are pre-built profiles for configuring Code Manager, generating SSH keys, and setting up your Git server to work with Code Manager. +If you use Puppet Enterprise and have not yet enabled and configured Code Manager, in addition to reading the official [documentation](https://puppet.com/docs/pe/latest/code_management/code_mgr.html) for enabling it, you may want to look at the Ramp-Up Program's control repository instead of this one. It's similar to this repo except that it has batteries included, so to speak. There are pre-built profiles for configuring Code Manager, generating SSH keys, and setting up your Git server to work with Code Manager. * <https://github.com/Puppet-RampUpProgram/control-repo> diff --git a/environment.conf b/environment.conf index a986777..4944466 100644 --- a/environment.conf +++ b/environment.conf @@ -1,2 +1,2 @@ -modulepath = site:modules:$basemodulepath -config_version = 'scripts/config_version.sh $environmentpath $environment' +modulepath = site-modules:modules:$basemodulepath +config_version = 'scripts/config_version.sh $environmentpath $environment' @@ -5,8 +5,8 @@ defaults: datadir: "data" hierarchy: - - name: 'Yaml backend' + - name: "Yaml backend" data_hash: yaml_data paths: - "nodes/%{trusted.certname}.yaml" - - 'common.yaml' + - "common.yaml" 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: diff --git a/site/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp index ae85e65..ae85e65 100644 --- a/site/profile/manifests/base.pp +++ b/site-modules/profile/manifests/base.pp diff --git a/site/profile/manifests/example.pp b/site-modules/profile/manifests/example.pp index 0b48c3a..0b48c3a 100644 --- a/site/profile/manifests/example.pp +++ b/site-modules/profile/manifests/example.pp diff --git a/site/role/manifests/database_server.pp b/site-modules/role/manifests/database_server.pp index aacc912..aacc912 100644 --- a/site/role/manifests/database_server.pp +++ b/site-modules/role/manifests/database_server.pp diff --git a/site/role/manifests/example.pp b/site-modules/role/manifests/example.pp index 2c1d2d7..2c1d2d7 100644 --- a/site/role/manifests/example.pp +++ b/site-modules/role/manifests/example.pp diff --git a/site/role/manifests/webserver.pp b/site-modules/role/manifests/webserver.pp index 314fa55..314fa55 100644 --- a/site/role/manifests/webserver.pp +++ b/site-modules/role/manifests/webserver.pp |