Try to use module as much as possible.
Add missing files.
Disable system module.
Add startit, based on flask to help agent start using puppet:

on client do this:
wget fred-master.lan.happylatte.com:7401/nagios-server1
nagios-server1 is your machines's hostname, then run this script:
bash nagios-server1
Move oak files into its sub folder.