From 240fde18cdaf875ae932be98f0e4b672d3a41d9e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 19 Dec 2012 22:40:01 +0100 Subject: [PATCH 1/1] fix merge --- modules/roles/manifests/static_source.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp index bf012a6e..dbdede18 100644 --- a/modules/roles/manifests/static_source.pp +++ b/modules/roles/manifests/static_source.pp @@ -3,8 +3,8 @@ class roles::static_source { file { '/etc/ssh/userkeys/staticsync': content => template('roles/static-mirroring/static-mirror-authorized_keys.erb'), } - file { '/usr/local/bin/static-mirror-ssh-wrap': - source => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap", + file { '/usr/local/bin/static-update-component': + content => template('roles/static-mirroring/static-update-component.erb'), mode => '0555', } file { '/usr/local/bin/static-mirror-ssh-wrap': -- 2.39.2