X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cf252d4bafb15db01febeb3152fc0284531bd14b;hb=f8fb0964e63eee704ef5f7a4679f22e4f02e60f5;hp=380ad3dac8e68d9261b763ecf36ae281d6c981fd;hpb=168aa3f05f914802698b8db5fdde823c4e992913;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 380ad3dac..cf252d4ba 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,31 +1,5 @@
-# a static mirror
-#
-# this receives pushes from the master and then usually serves the content to the public
-class roles::static_mirror {
-  include roles::static::base
-  include roles::static::srvdir
-
-  # mirrors talk only to masters
-  class { 'roles::static::ssh':
-    add_tag     => 'staticsync-master',
-    collect_tag => 'staticsync-mirror',
-  }
-
-  file { '/usr/local/bin/static-mirror-run':
-    source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
-    mode   => '0555',
-  }
-
-  file { '/usr/local/bin/static-mirror-run-all':
-    source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
-    mode   => '0555',
-  }
-
-  file { '/etc/cron.d/puppet-static-mirror': ensure => absent, }
-  concat::fragment { 'puppet-crontab--static-mirror':
-    target => '/etc/cron.d/puppet-crontab',
-    content  => @(EOF)
-      @reboot staticsync sleep 60; chronic static-mirror-run-all
-      | EOF
-  }
+# a static mirror.  It will get content for all components that it servers
+# from each component's master.
+class roles::static_mirror () {
+  include staticsync::static_mirror
 }