X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=b60e0b7574e8fd278e82c7d8c2c81b0caedbc470;hb=b205ddb2483ddcb875e17fc80379f881bb67acb6;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..b60e0b757 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,2 +1,23 @@
 class puppetmaster {
+
+	package { 'puppetmaster':
+		ensure => installed,
+	}
+	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)'
+	}
+
+	ssl::service { 'puppet-dashboard.debian.org':
+		notify => Service['apache2'],
+	}
 }