DynamicUser and python don't mix, apply by hand instead

[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 2b0d6e1..bcd32e5 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,6 @@
 class roles::static_mirror {
-
-       include roles::static_source
+       include roles::static_base
+       include roles::static_srvdir
        include apache2::expires
        include apache2::rewrite
 
@@ -21,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",
        }
@@ -122,6 +115,7 @@ class roles::static_mirror {
        ssl::service { 'mozilla.debian.net'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+       ssl::service { 'video.debian.net'              : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        # dc
        ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }