X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstaticsync%2Fmanifests%2Fstatic_master.pp;h=716b12c5110f9e306e340c956f03bf382bd15f96;hb=cf760168ec022b1fc8edb9c46d85b29a98af8ca6;hp=17efe762f6735b28b99ebd053ba9f80ca5eb69b4;hpb=e44a96b6508415fb4ed53c9c452a8d1b555e95af;p=mirror%2Fdsa-puppet.git diff --git a/modules/staticsync/manifests/static_master.pp b/modules/staticsync/manifests/static_master.pp index 17efe762f..716b12c51 100644 --- a/modules/staticsync/manifests/static_master.pp +++ b/modules/staticsync/manifests/static_master.pp @@ -22,16 +22,13 @@ class staticsync::static_master ( source => 'puppet:///modules/staticsync/static-master-update-component', mode => '0555', } - file { '/etc/static-clients.conf': - content => template('staticsync/static-clients.conf.erb'), + concat { '/etc/static-clients.conf': + ensure_newline => true, + warn => @(EOF), + ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. + | EOF } -# concat { '/etc/static-clients.conf': -# ensure_newline => true, -# warn => @(EOF), -# ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -# | EOF -# } -# Concat::Fragment <<| tag == 'staticsync::static-mirrors-to-trigger' |>> + Concat::Fragment <<| tag == 'staticsync::static-mirrors-to-trigger' |>> file { "/home/${staticsync::user}/static-master": ensure => link,