More puppet 3 templates fixes

This updates some more of the templates for puppet, specifically
those used on a Fedora system using both client and server.