diff options
author | mail_redacted_for_web | 2019-01-31 16:58:13 -0800 |
---|---|---|
committer | mail_redacted_for_web | 2019-01-31 16:58:13 -0800 |
commit | ead7f3c706657bbfae37ff40c8f919fb57c8a841 (patch) | |
tree | de6f52d4f7b0f23fafda9733aca5f5cc50e733bc | |
parent | 18aa0779aef7c2fd3d88dbcb699ecf4619326ff8 (diff) | |
download | control-repo-template-ead7f3c706657bbfae37ff40c8f919fb57c8a841.tar.bz2 |
Rename site directory to site-modules
Prior to this commit, we placed modules local to a users installation
in the `site` directory. This was just a convention and the name
`site` doesn't clearly convey what it is for.
After this commit, we place modules local to a users installation in
the `site-modules` directory. This makes it more clear to users
that this is a directory that modules go i. When users start
with bolt they won't even know what a control-repo is and
renaming site to site-modules gives them a better idea of why
they should put their modules with tasks in them. Also see:
https://tickets.puppetlabs.com/browse/BOLT-1108
-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 |
6 files changed, 1 insertions, 1 deletions
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 |