puppet 4 foo

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a4e14ca..19400ad 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
        package { 'apache2':
                ensure => installed,
@@ -8,31 +16,47 @@ class apache2 {
                require => Package['apache2'],
        }
 
+       apache2::module { 'reqtimeout': }
        apache2::module { 'info': }
        apache2::module { 'status': }
        apache2::module { 'headers': }
-
-       package { 'libapache2-mod-macro':
-               ensure => installed
-       }
-
-       apache2::module { 'macro':
-               require => Package['libapache2-mod-macro']
-       }
+       apache2::module { 'macro': }
 
        apache2::site { '00-default':
                site     => 'default-debian.org',
                content  => template('apache2/default-debian.org.erb'),
        }
+       apache2::site { 'xx-default-ssl':
+               site     => 'default-debian.org-ssl',
+               content  => template('apache2/default-debian.org-ssl.erb'),
+       }
 
        apache2::site { '000-default':
                ensure => absent,
        }
 
+       apache2::config { 'serve-cgi-bin':
+               ensure => absent,
+       }
+
        apache2::config { 'ressource-limits':
                ensure => absent,
        }
 
+       if has_role('udd') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('dgit_git') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('sso') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('popcon') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('qamaster') {
+               $memlimit = 300 * 1024 * 1024
+       } else {
+               $memlimit = 192 * 1024 * 1024
+       }
+
        apache2::config { 'resource-limits':
                content => template('apache2/resource-limits.erb'),
        }
@@ -57,6 +81,36 @@ class apache2 {
                source => 'puppet:///modules/apache2/puppet-ssl-macros',
        }
 
+       apache2::config { 'puppet-ftp-macros':
+               source => 'puppet:///modules/apache2/puppet-ftp-macros',
+       }
+
+       apache2::config { 'puppet-config':
+               content => template('apache2/puppet-config.erb'),
+       }
+
+       apache2::config { 'pratchett':
+               ensure => 'absent',
+       }
+
+       apache2::config { 'headers':
+               source => 'puppet:///modules/apache2/headers',
+       }
+
+       apache2::module { 'mpm_event': ensure => absent }
+       if has_role('apache_prefork') {
+               apache2::module { 'mpm_worker': ensure => absent }
+               apache2::module { 'mpm_prefork': }
+       } else {
+               apache2::module { 'mpm_prefork': ensure => absent }
+               apache2::module { 'mpm_worker': }
+       }
+       if $::lsbmajdistrelease > '7' {
+               file { '/etc/apache2/mods-available/mpm_worker.conf':
+                       content => template('apache2/mpm_worker.erb'),
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }
@@ -65,7 +119,7 @@ class apache2 {
                source => 'puppet:///modules/apache2/apache2.logrotate',
        }
 
-       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs', '/srv/www/default.debian.org/htdocs-disabled' ]:
                ensure  => directory,
                mode    => '0755',
        }
@@ -74,6 +128,15 @@ class apache2 {
                content => template('apache2/default-index.html'),
        }
 
+       file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
+               content => template('apache2/disabled-index.html'),
+       }
+
+       file { '/var/log/apache2/.nobackup':
+               mode    => '0644',
+               content => '',
+       }
+
        munin::check { 'apache_accesses': }
        munin::check { 'apache_processes': }
        munin::check { 'apache_volume': }
@@ -81,8 +144,12 @@ class apache2 {
        munin::check { 'ps_apache2':
                script => 'ps_',
        }
+       # The munin script needs this
+       package { 'libwww-perl':
+               ensure => installed,
+       }
 
-       if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+       if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':
@@ -98,4 +165,16 @@ class apache2 {
                description     => 'Allow web access',
                rule            => '&SERVICE(tcp, (http https))'
        }
+
+       exec { 'service apache2 reload':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'service apache2 reload',
+               refreshonly => true,
+               require =>  Package['apache2'],
+       }
+
+       apache2::config { 'puppet-ssl-key-pins':
+               content => template('apache2/ssl-key-pins.erb'),
+               notify  => Exec['service apache2 reload'],
+       }
 }