Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75508
Change subject: Move puppet templatedir again.
......................................................................
Move puppet templatedir again.
Apparently the default is in /var for some reason. I'm
pointing it to /etc/templates.
Also fixed a typo: s/pupppet/puppet/
Change-Id: I51ce25af65573d93e91775bc8fe0bc3a478cf9d2
---
M manifests/puppetmaster.pp
M templates/puppet/puppet.conf.d/20-master.conf.erb
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/75508/1
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index c3029eb..4895eca 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -89,7 +89,7 @@
owner => gitpuppet,
group => gitpuppet,
mode => 0400,
- source =>
'pupppet:///files/puppet/git/gitpuppet_authorized_keys';
+ source =>
'puppet:///files/puppet/git/gitpuppet_authorized_keys';
}
}
diff --git a/templates/puppet/puppet.conf.d/20-master.conf.erb
b/templates/puppet/puppet.conf.d/20-master.conf.erb
index d94fea3..f40ae3e 100644
--- a/templates/puppet/puppet.conf.d/20-master.conf.erb
+++ b/templates/puppet/puppet.conf.d/20-master.conf.erb
@@ -2,6 +2,7 @@
[master]
ca_md = sha1
certname = <%= scope.lookupvar('puppetmaster::server_name') %>
+templatedir = /etc/templates
# puppetmaster($config) settings
<% scope.lookupvar('puppetmaster::config').sort.each do |setting, value| -%>
--
To view, visit https://gerrit.wikimedia.org/r/75508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ce25af65573d93e91775bc8fe0bc3a478cf9d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
