Revert "Use static-master-grnet-01 for incoming.ports.d.o"

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

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index d0e281e..9fed024 100644 (file)
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -10,14 +10,10 @@ class puppetmaster {
                source => 'puppet:///modules/puppetmaster/puppetdb.conf'
        }
 
-       @ferm::rule { 'dsa-puppet':
+       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)'
+               domain          => '(ip ip6)',
+               rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN)',
        }
 
        file { '/srv/puppet.debian.org/puppet-facts':
@@ -27,14 +23,10 @@ class puppetmaster {
        }
        Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
 
-       file { '/etc/cron.d/puppet-update-fastly-ips':
-               ensure => absent,
-       }
-       file { '/etc/cron.d/update-fastly-ips':
-               ensure => absent,
-       }
-       concat::fragment { 'dsa-puppet-stuff---fastly-ips':
-               target => '/etc/cron.d/dsa-puppet-stuff',
+       file { '/etc/cron.d/puppet-update-fastly-ips': ensure => absent, }
+       file { '/etc/cron.d/update-fastly-ips': ensure => absent, }
+       concat::fragment { 'puppet-crontab---fastly-ips':
+               target => '/etc/cron.d/puppet-crontab',
                content  => @(EOF)
                        @daily  root    /usr/local/bin/update-fastly-ips /srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml
                        | EOF