diff --git a/NEWS b/NEWS index 5ea492f2451b95374cbd7dd9e1287ec119c06c29..acd19b0221d80df3919c3160c7bf507eec1db8cd 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,15 @@ -release/004.027 (2015-02-24) +release/004.028 (2015-02-24c) + + [puppetclient] Undo the basemodulepath configuration directive + setting from release/004.027. The default basemodulepath is fine. + (adamhl) + +release/004.027 (2015-02-24b) [puppetclient] Set up basemodulepath configuration directive for puppetservice1-dev (adamhl) -release/004.026 (2015-02-24) +release/004.026 (2015-02-24a) [yumtools] added new group of yum-related commands that can be used to manage package diff --git a/templates/puppetclient/puppet.conf.template.erb b/templates/puppetclient/puppet.conf.template.erb index 653f13daceea5df6e07cf14bdf57cc7c0c839166..693fa0f739d45487f35503bf7c60339635779244 100644 --- a/templates/puppetclient/puppet.conf.template.erb +++ b/templates/puppetclient/puppet.conf.template.erb @@ -147,17 +147,6 @@ rundir = /var/run/puppet # when acting as puppet master, so we use a different directory. ssldir = /srv/puppetmaster/ssl <% end -%> -<% if (hostname =~ /puppetservice1-dev/) then -%> - -# Here we the GLOBAL module search path. This path is searched by ALL -# environments. This is usefule when you have Puppet code that you want -# all your environments to have access to, e.g., stdlib. -# -# Note well that for this path to be seen, you need to append it to the -# modulepath directgive in each environments environment.conf, e.g., -# modulepath = services:modules:$basemodulepath -basemodulepath = /usr/share/puppet/modules -<% end -%> # List of reports to run <% if (puppet3) -%>