X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=7875bd717dad6a29a0142cc57270bc881ff67d08;hb=6aab9d318ed672e4f00bcede926050acc8b4843f;hp=a7715586fd69c27400a983a0e4dcff0d90e6d213;hpb=709438a136ff74644565a7c81ceefb922ca6b519;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a7715586f..7875bd717 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,96 +1,175 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
-
-	package { 'apache2':
-		ensure => installed,
-	}
-
-	service { 'apache2':
-		ensure  => running,
-		require => Package['apache2'],
-	}
-
-	apache2::module { 'info': }
-	apache2::module { 'status': }
-
-	apache2::site { '00-default':
-		site     => 'default-debian.org',
-		content  => template('apache2/default-debian.org.erb'),
-	}
-
-	apache2::site { '000-default':
-		ensure => absent,
-	}
-
-	apache2::config { 'ressource-limits':
-		content => template('apache2/ressource-limits.erb'),
-	}
-
-	apache2::config { 'security':
-		source => 'puppet:///modules/apache2/security',
-	}
-
-	apache2::config { 'local-serverinfo':
-		source => 'puppet:///modules/apache2/local-serverinfo',
-	}
-
-	apache2::config { 'server-status':
-		source => 'puppet:///modules/apache2/server-status',
-	}
-
-	file { '/etc/apache2/sites-available/common-ssl.inc':
-		source => 'puppet:///modules/apache2/common-ssl.inc',
-		require => Package['apache2'],
-		notify  => Service['apache2'],
-	}
-
-	file { '/etc/logrotate.d/apache2':
-		source => 'puppet:///modules/apache2/apache2.logrotate',
-	}
-
-	file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
-		ensure  => directory,
-		mode    => '0755',
-	}
-
-	file { '/srv/www/default.debian.org/htdocs/index.html':
-		content => template('apache2/default-index.html'),
-	}
-
-	munin::check { 'apache_accesses': }
-	munin::check { 'apache_processes': }
-	munin::check { 'apache_volume': }
-	munin::check { 'apache_servers': }
-	munin::check { 'ps_apache2':
-		script => 'ps_',
-	}
-
-	if $php5 {
-		package { 'php5-suhosin':
-			ensure  => installed,
-			require => Package['apache2'],
-		}
-
-		file { '/etc/php5/conf.d/suhosin.ini':
-			source  => 'puppet:///modules/apache2/suhosin.ini',
-			require => Package['php5-suhosin'],
-			notify  => Service['apache2'],
-		}
-	}
-
-	if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude,widor] {
-		include apache2::dynamic
-	} else {
-		@ferm::rule { 'dsa-http':
-			prio        => '23',
-			description => 'Allow web access',
-			rule        => '&SERVICE(tcp, (http https))'
-		}
-	}
-
-	@ferm::rule { 'dsa-http-v6':
-		domain          => '(ip6)',
-		prio            => '23',
-		description     => 'Allow web access',
-		rule            => '&SERVICE(tcp, (http https))'
-	}
+  include webserver
+
+  package { 'apache2':
+    ensure => installed,
+  }
+
+  service { 'apache2':
+    ensure  => running,
+    require => Package['apache2'],
+  }
+
+  apache2::module { 'reqtimeout': }
+  apache2::module { 'info': }
+  apache2::module { 'status': }
+  apache2::module { 'headers': }
+  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,
+  }
+
+  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
+  }
+  # debbugs cgis like to fork and don't deal well with EAGAIN
+  if has_role('bugs_base') {
+    $proclimit = 450
+  } else {
+    $proclimit = 256
+  }
+
+  apache2::config { 'resource-limits':
+    content => template('apache2/resource-limits.erb'),
+  }
+
+  apache2::config { 'security':
+    source => 'puppet:///modules/apache2/security',
+  }
+
+  apache2::config { 'logformat-privacy':
+    source => 'puppet:///modules/apache2/logformat-privacy',
+  }
+
+  apache2::config { 'local-serverinfo':
+    source => 'puppet:///modules/apache2/local-serverinfo',
+  }
+
+  apache2::config { 'server-status':
+    source => 'puppet:///modules/apache2/server-status',
+  }
+
+  apache2::config { 'puppet-ssl-macros':
+    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 { 'headers':
+    source => 'puppet:///modules/apache2/headers',
+  }
+
+  apache2::config { 'disabled-service':
+    source => 'puppet:///modules/apache2/disabled-service',
+  }
+
+  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': }
+  }
+  file { '/etc/apache2/mods-available/mpm_worker.conf':
+    content => template('apache2/mpm_worker.erb'),
+  }
+
+  file { '/etc/logrotate.d/apache2':
+    source => 'puppet:///modules/apache2/apache2.logrotate',
+  }
+
+  file { '/var/log/apache2':
+    ensure => directory,
+    mode   => '0755',
+  }
+  file { '/var/log/apache2/.nobackup':
+    mode    => '0644',
+    content => '',
+  }
+
+  munin::check { 'apache_accesses': }
+  munin::check { 'apache_processes': }
+  munin::check { 'apache_volume': }
+  munin::check { 'apache_servers': }
+  munin::check { 'ps_apache2':
+    script => 'ps_',
+  }
+  # The munin script needs this
+  package { 'libwww-perl':
+    ensure => installed,
+  }
+
+  if (! has_role('apache_not_public')) {
+    if has_role('apache_ratelimited') {
+      include apache2::dynamic
+    } else {
+      ferm::rule { 'dsa-http':
+        prio        => '23',
+        description => 'Allow web access',
+        rule        => '&SERVICE(tcp, (http https))'
+      }
+
+      ferm::rule { 'dsa-http-v6':
+        domain      => '(ip6)',
+        prio        => '23',
+        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'],
+  }
+
+  apache2::config { 'local-scheduled-shutdown':
+    source => 'puppet:///modules/apache2/local-scheduled-shutdown',
+  }
 }