diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | environment.conf | 2 | ||||
| -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 |
7 files changed, 5 insertions, 5 deletions
@@ -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,7 +36,7 @@ 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 diff --git a/environment.conf b/environment.conf index a986777..11e1003 100644 --- a/environment.conf +++ b/environment.conf @@ -1,2 +1,2 @@ -modulepath = site:modules:$basemodulepath +modulepath = site-modules:modules:$basemodulepath config_version = 'scripts/config_version.sh $environmentpath $environment' 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 |