X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=b14d408d732709a54130e57ec24cd3ae5549a035;hb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;hp=ae66345e0ab99b8a961e5bc65326a0e9c1c66ecd;hpb=7968db2a87bf98cfd0b6f4dfb211696b167d6d57;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ae66345e..b14d408d 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,35 +1,116 @@
 class apache2 {
-	package {
-		apache2: ensure => installed;
-	}
-
-	file {
-		"/etc/apache2/conf.d/security":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
-			             "puppet:///apache2/common/etc/apache2/conf.d/security" ],
-			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
-
-		"/etc/apache2/sites-available/default-debian.org":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org",
-			             "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
-			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
-		"/srv/www":
-			mode    => 755,
-			ensure  => directory;
-		"/srv/www/default.debian.org":
-			mode    => 755,
-			ensure  => directory;
-		"/srv/www/default.debian.org/htdocs":
-			mode    => 755,
-			ensure  => directory;
-		"/srv/www/default.debian.org/htdocs/index.html":
-			content => template("default-index.html");
-	}
-
-	exec { "apache2 reload":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
+	package { 'apache2':
+		ensure => installed,
+	}
+
+	service { 'apache2':
+		ensure  => running,
+		require => Package['apache2'],
+	}
+
+	apache2::module { 'info': }
+	apache2::module { 'status': }
+	apache2::module { 'headers': }
+
+	package { 'libapache2-mod-macro':
+		ensure => installed
+	}
+
+	apache2::module { 'macro':
+		require => Package['libapache2-mod-macro']
+	}
+
+	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':
+		ensure => absent,
+	}
+
+	if $::fqdn in $site::roles['buildd_master'] {
+		$memlimit = 192 * 1024**2
+	} elsif $::fqdn in $site::roles['nagiosmaster']{
+		$memlimit = 96 * 1024**2
+	} elsif $::fqdn in $site::roles['packagesqamaster']{
+		$memlimit = 192 * 1024**2
+	} else {
+		$memlimit = 32 * 1024**2
+	}
+
+	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',
+	}
+
+	file { '/etc/apache2/sites-available/common-ssl.inc':
+		ensure => absent,
+	}
+
+	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'),
+	}
+
+	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_',
+	}
+
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+		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))'
 	}
 }