Add missing domain component, now with 100% more valid names

[mirror/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 b3b8bb4..bcd32e5 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,5 +1,6 @@
 class roles::static_mirror {
        include roles::static_base
+       include roles::static_srvdir
        include apache2::expires
        include apache2::rewrite
 
@@ -20,13 +21,6 @@ class roles::static_mirror {
                mode   => '0555',
        }
 
-       file { '/srv/static.debian.org':
-               ensure => directory,
-               owner  => staticsync,
-               group  => staticsync,
-               mode   => '02755'
-       }
-
        file { '/etc/cron.d/puppet-static-mirror':
                        content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
        }