X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=c98464c37fa39af83c194601ec1817bcd71efe45;hb=aed4553a3e2cdb43f83711429bd95cd8231de244;hp=958d72243cabc5faa2704de7a6d289c1142d92cf;hpb=3d61b6c0fcbab717ce99bd5c070ea83983b6bbc5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 958d72243..c98464c37 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,41 +1,47 @@
-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 => 'puppet:///modules/roles/static-mirroring/vhost/planet.debian.org.erb',
-    }
+class roles::static_mirror {
+
+	include roles::static_source
+
+	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   => '0555',
+	}
+
+	file { '/srv/static.debian.org':
+		ensure => directory,
+		owner  => staticsync,
+		group  => staticsync,
+		mode   => '02755'
+	}
+
+	file { '/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::config { "local-static-vhost.conf":
+		content => template('roles/static-mirroring/static-vhost.conf.erb'),
+	}
+
+	apache2::site { '010-planet.debian.org':
+		site    => 'planet.debian.org',
+		content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
+	}
+
+	apache2::site { '010-static-vhosts-simple':
+		site => "static-vhosts-simple",
+		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: