Move firewall rule for entropy into node definition to fix dependency cycle

Signed-off-by: Daniel Thomas <drt24@cam.ac.uk>
entropy: apt management only works for ubuntu guests and entropy is debian

Signed-off-by: Daniel Thomas <drt24@cam.ac.uk>
Made dhcp use the apache class, to open port 80{,80}
Opened ports on DHCP for apache
openroommap: bumped version number on servlet
openroommap: turned out that "1.0.1" should be a string not a float ;-)
open-room-map: attempt at creating a postgres server using the postgres module
open-room-map: added missing netmask from access string
openroommap: added a request to provide a database user
open-room-map: messing with syntax
open-room-map: some complaint about passwords needed or something - trying something else
open-room-map: fixed typo in authorized_keys file name for jenkins
open-room-map: bumped version number for servlet to include new parameter settings
open-room-map: trying to add another database user
Merge branch 'master' of dtg-code.cl.cam.ac.uk:infrastructure/dtg-puppet
Merge remote-tracking branch 'dhcp/master'
Added a default apache config to DHCP
Added a pool to dhcp, and removed the dnsupdatekey which was not valid