From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 19 Dec 2012 21:40:01 +0000 (+0100)
Subject: fix merge
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=240fde18cdaf875ae932be98f0e4b672d3a41d9e;hp=927f9ca9bed8928ea91ba1a599857c483ae4994e;p=dsa-puppet.git

fix merge
---

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':