From ead7f3c706657bbfae37ff40c8f919fb57c8a841 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 31 Jan 2019 16:58:13 -0800 Subject: [PATCH] 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 --- environment.conf | 2 +- {site => site-modules}/profile/manifests/base.pp | 0 {site => site-modules}/profile/manifests/example.pp | 0 {site => site-modules}/role/manifests/database_server.pp | 0 {site => site-modules}/role/manifests/example.pp | 0 {site => site-modules}/role/manifests/webserver.pp | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename {site => site-modules}/profile/manifests/base.pp (100%) rename {site => site-modules}/profile/manifests/example.pp (100%) rename {site => site-modules}/role/manifests/database_server.pp (100%) rename {site => site-modules}/role/manifests/example.pp (100%) rename {site => site-modules}/role/manifests/webserver.pp (100%) 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 similarity index 100% rename from site/profile/manifests/base.pp rename to site-modules/profile/manifests/base.pp diff --git a/site/profile/manifests/example.pp b/site-modules/profile/manifests/example.pp similarity index 100% rename from site/profile/manifests/example.pp rename to site-modules/profile/manifests/example.pp diff --git a/site/role/manifests/database_server.pp b/site-modules/role/manifests/database_server.pp similarity index 100% rename from site/role/manifests/database_server.pp rename to site-modules/role/manifests/database_server.pp diff --git a/site/role/manifests/example.pp b/site-modules/role/manifests/example.pp similarity index 100% rename from site/role/manifests/example.pp rename to site-modules/role/manifests/example.pp diff --git a/site/role/manifests/webserver.pp b/site-modules/role/manifests/webserver.pp similarity index 100% rename from site/role/manifests/webserver.pp rename to site-modules/role/manifests/webserver.pp