Merge branch 'static'

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

Conflicts:
	modules/roles/manifests/static_source.pp

diff --cc modules/roles/manifests/static_source.pp
index 821a6cf,28ae6d4..bf012a6
--- 1/modules/roles/manifests/static_source.pp
--- 2/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:

diff --cc modules/sudo/files/sudoers
Simple merge