Defined is a bad idea, but if you use it on one side (the master) it should be on the other side too (the agent)
Getting rid of the custom vhost template, using the newer apache::vhost parameters
Rmeove the passenger class dependency