fix $ prefix for sources and not_soruces... looks like older puppet was fine with it..
add sources for server and client definitions