X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=43432af7b188f95b7c0f70ccdfa2a9637ad05b18;hb=77808009ee3d87dfc2a2b655dbeb535623a10bf6;hp=c48ef59914018907f11ba54c0f052490a63fe27c;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index c48ef5991..43432af7b 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,2 +1,21 @@
 class puppetmaster {
+
+	include site::params
+
+	package { 'puppetmaster':
+		ensure => $site::params::puppetversion,
+	}
+	file { '/etc/puppet/hiera.yaml':
+		source => 'puppet:///modules/puppetmaster/hiera.yaml'
+	}
+
+	@ferm::rule { 'dsa-puppet':
+		description     => 'Allow puppet access',
+		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V4)'
+	}
+	@ferm::rule { 'dsa-puppet-v6':
+		domain          => 'ip6',
+		description     => 'Allow puppet access',
+		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
+	}
 }