X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cf252d4bafb15db01febeb3152fc0284531bd14b;hb=dcd05444f7179ed841fdb1cc786b6c1931724cbd;hp=8ba0fe91c0a408e07c5d9990a8c367ed8b1ded3d;hpb=0202ca3944a94eb3e65bcac5ea83d14693d68e3f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 8ba0fe91c..cf252d4ba 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,43 +1,5 @@
-class roles::static_mirror inherits roles::static_source {
-    include apache2
-
-    package { 'libapache2-mod-macro':
-        ensure => installed,
-    }
-
-    apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
-    apache2::module { 'rewrite': }
-    apache2::module { 'expires': }
-
-    file {
-        '/usr/local/bin/static-mirror-run':
-            source  => "puppet:///modules/roles/static-mirroring/static-mirror-run",
-            mode => 555,
-            ;
-
-        "/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",
-            ;
-
-        '/etc/apache2/inc':
-            ensure => directory,
-            ;
-        '/etc/apache2/inc/static-mirror-vhost':
-            content => template('roles/static-mirroring/apache-inc-static-mirror-vhost.erb'),
-            ;
-    }
-
-    apache2::site { '010-planet.debian.org':
-        site   => 'planet.debian.org',
-        source => 'puppet:///modules/roles/static-mirroring/vhost/planet.debian.org',
-    }
+# 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
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: