Try this instead. III

[dsa-puppet.git] / modules / roles / manifests / static_mirror.pp

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 8ba0fe91c0a408e07c5d9990a8c367ed8b1ded3d..958d72243cabc5faa2704de7a6d289c1142d92cf 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -24,18 +24,16 @@ class roles::static_mirror inherits roles::static_source {
         "/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'),
-            ;
+    $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',
-        source => 'puppet:///modules/roles/static-mirroring/vhost/planet.debian.org',
+        content => 'puppet:///modules/roles/static-mirroring/vhost/planet.debian.org.erb',
     }
 }
 # vim:set et: