X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=0816754df828fb73a4793aeb51cfd1c7e48a578b;hb=555de34d7aaa711413ef387b383e07815ad9c0f4;hp=df11d6a4231bccbbd87c70f157d3c1eb336cf840;hpb=3693942d822dc7a6428525a84d994d5338a34fc0;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp index df11d6a42..0816754df 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -1,26 +1,23 @@ -class roles::static_master inherits roles::static_base { - file { - '/etc/ssh/userkeys/staticsync': - content => template('roles/static-mirroring/static-master-authorized_keys.erb'), - ; - '/usr/local/bin/static-master-run': - source => "puppet:///modules/roles/static-mirroring/static-master-run", - mode => 555, - ; - '/usr/local/bin/static-master-ssh-wrap': - source => "puppet:///modules/roles/static-mirroring/static-master-ssh-wrap", - mode => 555, - ; - '/usr/local/bin/static-master-update-component': - source => "puppet:///modules/roles/static-mirroring/static-master-update-component", - mode => 555, - ; +class roles::static_master { - '/etc/static-clients.conf': - content => template('roles/static-mirroring/static-clients.conf.erb'), - ; - } + include roles::static_base + + file { '/etc/ssh/userkeys/staticsync': + content => template('roles/static-mirroring/static-master-authorized_keys.erb'), + } + file { '/usr/local/bin/static-master-run': + source => 'puppet:///modules/roles/static-mirroring/static-master-run', + mode => '0555', + } + file {'/usr/local/bin/static-master-ssh-wrap': + source => 'puppet:///modules/roles/static-mirroring/static-master-ssh-wrap', + mode => '0555', + } + file { '/usr/local/bin/static-master-update-component': + source => 'puppet:///modules/roles/static-mirroring/static-master-update-component', + mode => '0555', + } + file { '/etc/static-clients.conf': + content => template('roles/static-mirroring/static-clients.conf.erb'), + } } -# vim:set et: -# vim:set sts=4 ts=4: -# vim:set shiftwidth=4: