Skip to content
Snippets Groups Projects
Commit a202e58a authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

reverting previous commit to puppet.conf.template.erb

parent 59b6c2e0
No related branches found
No related tags found
No related merge requests found
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 [puppetclient] Set up basemodulepath configuration directive for
puppetservice1-dev (adamhl) puppetservice1-dev (adamhl)
release/004.026 (2015-02-24) release/004.026 (2015-02-24a)
[yumtools] added new group of yum-related [yumtools] added new group of yum-related
commands that can be used to manage package commands that can be used to manage package
......
...@@ -147,17 +147,6 @@ rundir = /var/run/puppet ...@@ -147,17 +147,6 @@ rundir = /var/run/puppet
# when acting as puppet master, so we use a different directory. # when acting as puppet master, so we use a different directory.
ssldir = /srv/puppetmaster/ssl ssldir = /srv/puppetmaster/ssl
<% end -%> <% 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 # List of reports to run
<% if (puppet3) -%> <% if (puppet3) -%>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment