Added support for custom templates in /srv/puppet/templates directory.

puppet/manifests/init.pp

@@ -257,7 +257,8 @@ class puppet::server inherits puppet::client {
                      Package["puppetmaster"], ],
         before  => Service["puppetmaster"],
     }
-    file { "/srv/puppet/files":
+    file { [ "/srv/puppet/files",
+             "/srv/puppet/templates" ]:
         ensure  => directory,
         mode    => 0755,
         owner   => root,

puppet/templates/puppetmaster.conf.erb

@@ -12,6 +12,9 @@
     # Server bucket store.
     bucketdir = /srv/puppet/bucket
 
+    # Put custom templates under datadirectory
+    templatedir = /srv/puppet/templates
+
 <% if puppet_storeconfigs != 'none' -%>
     # Use storeconfigs
     storeconfigs = true