From: Peter Palfrader Date: Sun, 22 Sep 2019 21:36:22 +0000 (+0200) Subject: whitespace change X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d33c10fd9bf95951c6fbc09ca65c7a086ad55308;p=mirror%2Fdsa-puppet.git whitespace change --- diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp index 080bee57d..cc322ac26 100644 --- a/modules/puppetmaster/manifests/init.pp +++ b/modules/puppetmaster/manifests/init.pp @@ -1,35 +1,34 @@ class puppetmaster { + package { 'puppetmaster': + ensure => installed, + } + file { '/etc/puppet/puppetdb.conf': + source => 'puppet:///modules/puppetmaster/puppetdb.conf' + } - package { 'puppetmaster': - ensure => installed, - } - file { '/etc/puppet/puppetdb.conf': - source => 'puppet:///modules/puppetmaster/puppetdb.conf' - } + ferm::rule { 'dsa-puppet': + description => 'Allow puppet access', + domain => '(ip ip6)', + rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN)', + } - ferm::rule { 'dsa-puppet': - description => 'Allow puppet access', - domain => '(ip ip6)', - rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN)', - } + file { '/srv/puppet.debian.org/puppet-facts': + ensure => directory + } + concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml': + } + Concat::Fragment <<| tag == 'onionbalance-services.yaml' |>> - file { '/srv/puppet.debian.org/puppet-facts': - ensure => directory - } - concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml': - } - 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 { '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 - } - file { '/usr/local/bin/update-fastly-ips': - source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh', - mode => '0555', - } + 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 + } + file { '/usr/local/bin/update-fastly-ips': + source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh', + mode => '0555', + } }