X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cf252d4bafb15db01febeb3152fc0284531bd14b;hb=64c1545f242396ff122e1af0ce35cf952a01c58c;hp=60aa07434a6493011fb865e1dca55133399f55b8;hpb=a362a04f88f5ca7af5939e6699ef71990e140581;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 60aa07434..cf252d4ba 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,41 +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",
-            ;
-    }
-
-    $vhost_listen = $::hostname ? {
-        klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-        default => '*:80',
-    }
-
-    apache2::site { '010-planet.debian.org':
-        site   => 'planet.debian.org',
-        content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
-    }
+# 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: