no longer a separate service

[dsa-puppet.git] / modules / puppetmaster / manifests / init.pp

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index ca91a0bb2ee995ec680096314ee1e77c7d0754ea..43432af7b188f95b7c0f70ccdfa2a9637ad05b18 100644 (file)
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,5 +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)'
+       }
 }