Also sources can ssh to the master to trigger stuff

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

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9b10b10..bf8d445 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,19 +1,16 @@
-class roles::static_mirror inherits roles::mirror_base {
+class roles::static_mirror inherits roles::static_source {
     file {
-        '/etc/ssh/userkeys/staticsync':
-            content => template('roles/static-mirror-authorized_keys.erb'),
-            ;
         '/usr/local/bin/static-mirror-run':
             source  => "puppet:///modules/roles/static-mirroring/static-mirror-run",
             mode => 555,
             ;
-        '/usr/local/bin/static-mirror-ssh-wrap':
-            source  => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap",
-            mode => 555,
-            ;
-    }
 
-    file {
+        "/srv/static.debian.org":
+            ensure  => directory,
+            owner   => staticsync,
+            group   => staticsync,
+            mode    => '02755'
+            ;
         "/etc/cron.d/puppet-static-mirror":
             content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null\n",
             ;