Merge branch 'static'

[mirror/dsa-puppet.git] / modules / roles / manifests / static_source.pp

diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
index 28ae6d4..bf012a6 100644 (file)
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@ -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: