appstream ssl

[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 390e56338ca06e0271890c15cdb3c2a175ea6e00..be25b5bd86a702f104b490e862d0a56140fb3896 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,41 +1,86 @@
-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",
-            ;
-
-    }
-
-    apache2::config { 'static-mirror-macros':
-        content => template('roles/static-mirroring/apache-conf-static-mirror-macros.erb'),
-    }
-
-    apache2::site { '010-planet.debian.org':
-        site   => 'planet.debian.org',
-        source => 'puppet:///modules/roles/static-mirroring/vhost/planet.debian.org',
-    }
+class roles::static_mirror {
+
+       include roles::static_source
+       include apache2::cache
+
+       package { 'libapache2-mod-geoip': ensure => installed, }
+       package { 'geoip-database': ensure => installed, }
+
+       apache2::module { 'include': }
+       apache2::module { 'ssl': }
+       apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
+
+       file { '/usr/local/bin/static-mirror-run':
+               source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
+               mode   => '0555',
+       }
+
+       file { '/usr/local/bin/static-mirror-run-all':
+               source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
+               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",
+       }
+
+       $vhost_listen = $::hostname ? {
+               klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+               default => '*:80',
+       }
+       $vhost_listen_443 = $::hostname ? {
+               klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+               default => '*:443',
+       }
+
+       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-lintian.debian.org':
+               site    => 'lintian.debian.org',
+               content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
+       }
+
+       apache2::site { '010-static-vhosts-simple':
+               site => 'static-vhosts-simple',
+               content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
+       }
+
+       $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
+       apache2::site { '005-www.debian.org':
+               site   => 'www.debian.org',
+               content => template('roles/apache-www.debian.org.erb'),
+       }
+
+       ssl::service { 'dsa.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'www.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'bits.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'lintian.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'rtc.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'appstream.debian.org':
+               notify => Service['apache2'],
+       }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: