puppetmaster - use apache::site

use the newer apache::site method to
setup the Apache site, rather than a file
resource and have proper symlinks again

currently, due to refactoring, it is like this:

root@palladium:/etc/apache2/sites-available# file puppetmaster
puppetmaster: ASCII English text

root@palladium:/etc/apache2/sites-enabled# file puppetmaster
puppetmaster: ASCII English text

root@palladium:/etc/apache2/sites-enabled#

if diff puppetmaster ../sites-available/puppetmaster ; then
echo "meh, different content, confusing"; fi

meh, different content, confusing

Change-Id: I0e4aa880003370093c7ee1a49f71a16f697a83ef