From a202e58a1593c6fc3d734e524d1d62dc192c4713 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Tue, 24 Feb 2015 15:14:25 -0800
Subject: [PATCH] reverting previous commit to puppet.conf.template.erb
---
NEWS | 10 ++++++++--
templates/puppetclient/puppet.conf.template.erb | 11 -----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/NEWS b/NEWS
index 5ea492f..acd19b0 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 653f13d..693fa0f 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) -%>
--
GitLab