X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=bf8d445abfebe7806ccf9629d13ce0094d191a57;hb=633e363d0b7dedf31bd8a0144f47995998257ee1;hp=9b10b1039b9516eef4915a24db8a48dc88ce7aa1;hpb=d6e20ea4c083d9978ad4c3e5eccaffa2e887698a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9b10b1039..bf8d445ab 100644
--- 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",
             ;