Moving more stuff to Puppet config and annotating the script