From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 19 Dec 2012 21:38:15 +0000 (+0100)
Subject: Merge branch 'static'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=927f9ca9bed8928ea91ba1a599857c483ae4994e;p=dsa-puppet.git

Merge branch 'static'

* static:
  static-update-component planet
  static-update-component wrapper

Conflicts:
	modules/roles/manifests/static_source.pp
---

927f9ca9bed8928ea91ba1a599857c483ae4994e
diff --cc modules/roles/manifests/static_source.pp
index 821a6cf0,28ae6d4b..bf012a6e
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@@ -1,10 -1,18 +1,14 @@@
 -class roles::static_source inherits roles::static_base {
 -    file {
 -        '/etc/ssh/userkeys/staticsync':
 -            content => template('roles/static-mirroring/static-mirror-authorized_keys.erb'),
 -            ;
 -        '/usr/local/bin/static-mirror-ssh-wrap':
 -            source  => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap",
 -            mode => 555,
 -            ;
 -        '/usr/local/bin/static-update-component':
 -            content => template('roles/static-mirroring/static-update-component.erb'),
 -            mode => 555,
 -            ;
 -    }
 +class roles::static_source {
 +	include roles::static_base
 +	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",
++		mode    => '0555',
++	}
 +	file { '/usr/local/bin/static-mirror-ssh-wrap':
 +		source => 'puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap',
 +		mode   => '0555',
 +	}
  }
 -# vim:set et:
 -# vim:set sts=4 ts=4:
 -# vim:set shiftwidth=4: