Update the linux services to in line with the puppet support

Please review and merge

Update the service template inline with puppet