puppet.conf - just the default, please.  /etc/resolv.conf - adding domain so puppetmaster can be found.