get correct certname

templates/puppetclient/puppet.conf.template.erb

@@ -6,6 +6,16 @@
   else
     use_directory_environments = false
   end
+
+  if    (hostname =~ /^jimhenson-dev$/) then
+    certname = 'jimhenson-dev.stanford.edu'
+  elsif (hostname =~ /^jimhenson\d/$) then
+    certname = 'jimhenson.stanford.edu'
+  elsif (hostname =~ /^puppetservice1-dev$/) then
+    certname = 'puppetservice1-dev.stanford.edu'
+  elsif (hostname =~ /^puppetservice\d$/) then
+    certname = 'puppetservice.stanford.edu'
+  end
 -%>
 # /etc/puppet/puppet.conf -- Puppet system management configuration.
 #
@@ -92,13 +102,7 @@ show_diff = true
 <% if is_master then -%>
 
 [master]
-<% if (hostname =~ /jimhenson-dev/) then -%>
-# In the dev environment, use jimhenson-dev.stanford.edu as the name
-certname = jimhenson-dev.stanford.edu
-<% else -%>
-# Use jimhenson.stanford.edu as the name
-certname = jimhenson.stanford.edu
-<% end -%>
+certname = <%= certname %>
 
 # Send log messages to syslog for proper handling
 syslogfacility = local2