Improved puppetmaster configuration