devsnack/control-repo
1
0
Fork 0
Code Releases Activity

Merge pull request #71 from npwalker/rename_site_to_site-modules

Browse Source 
Rename site directory to site-modules
This commit is contained in:
Reid Vandewiele 2019-02-26 15:26:47 -08:00 committed by GitHub
commit 306107b98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -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. * 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. * 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: * 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 site-modules directory for roles, profiles, and any custom modules for your organization.
* A config_version script. * 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. * 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: 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. │   ├── code_manager_config_version.rb # A config_version script for Code Manager.
│   ├── config_version.rb # A config_version script for r10k. │   ├── config_version.rb # A config_version script for r10k.
│   └── config_version.sh # A wrapper that chooses the appropriate config_version script. │   └── 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. │   ├── profile/ # The profile module.
│   └── role/ # The role module. │   └── role/ # The role module.
├── LICENSE ├── LICENSE

2
environment.conf
View File

@ -1,2 +1,2 @@
modulepath = site:modules:$basemodulepath modulepath = site-modules:modules:$basemodulepath
config_version = 'scripts/config_version.sh $environmentpath $environment' config_version = 'scripts/config_version.sh $environmentpath $environment'

0
site/profile/manifests/base.pp → site-modules/profile/manifests/base.pp
View File

0
site/profile/manifests/example.pp → site-modules/profile/manifests/example.pp
View File

0
site/role/manifests/database_server.pp → site-modules/role/manifests/database_server.pp
View File

0
site/role/manifests/example.pp → site-modules/role/manifests/example.pp
View File

0
site/role/manifests/webserver.pp → site-modules/role/manifests/webserver.pp
View File