X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=a7715586fd69c27400a983a0e4dcff0d90e6d213;hb=709438a136ff74644565a7c81ceefb922ca6b519;hp=dc8c66c8d2fa6d27f6a95f72198a8d80aaa983a9;hpb=f90ff857c6c99b1a3d8b9837c2b593641f560859;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dc8c66c8..a7715586 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,118 +1,96 @@
 class apache2 {
-        include munin-node::apache
-
-	package {
-		"apache2": ensure => installed;
-		"logrotate": ensure => installed;
-	}
-
-        define activate_apache_site($ensure=present, $site=$name) {
-                case $site {
-                        "": { $base = $name }
-                        default: { $base = $site }
-                }
-
-                case $ensure {
-                        present: {
-                                file { "/etc/apache2/sites-enabled/$name":
-                                         ensure => "/etc/apache2/sites-available/$base",
-                                         require => Package["apache2"],
-                                         notify => Exec["reload-apache2"];
-                                }
-                        }
-                        absent: {
-                                file { "/etc/apache2/sites-enabled/$name":
-                                         ensure => $ensure,
-                                         notify => Exec["reload-apache2"];
-                                }
-                        }
-	                default: { err ( "Unknown ensure value: '$ensure'" ) }
-                }
-        }
-
-	define enable_module($ensure=present) {
-	        case $ensure {
-	                present: {
-	                        exec { "/usr/sbin/a2enmod $name":
-	                                unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-	                                notify => Exec["force-reload-apache2"],
-	                        }
-	                }
-	                absent: {
-	                        exec { "/usr/sbin/a2dismod $name":
-	                                onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-	                                notify => Exec["force-reload-apache2"],
-	                        }
-	                }
-	                default: { err ( "Unknown ensure value: '$ensure'" ) }
-	         }
-	}
-
-        enable_module {
-                "info":;
-                "status":;
-        }
-
-        activate_apache_site {
-                "00-default": site => "default-debian.org";
-                "000-default": ensure => absent;
-        }
-
-	file {
-		"/etc/apache2/conf.d/ressource-limits":
-			content => template("apache2/ressource-limits.erb"),
-			require => Package["apache2"],
-                        notify  => Exec["reload-apache2"];
-		"/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["reload-apache2"];
-		"/etc/apache2/conf.d/local-serverinfo":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo",
-			             "puppet:///apache2/common/etc/apache2/conf.d/local-serverinfo" ],
-			require => Package["apache2"],
-                        notify  => Exec["reload-apache2"];
-		"/etc/apache2/conf.d/server-status":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/server-status",
-			             "puppet:///apache2/common/etc/apache2/conf.d/server-status" ],
-			require => Package["apache2"],
-                        notify  => Exec["reload-apache2"];
-
-		"/etc/apache2/sites-available/default-debian.org":
-			content => template("apache2/default-debian.org.erb"),
-			require => Package["apache2"],
-                        notify  => Exec["reload-apache2"];
-
-		"/etc/logrotate.d/apache2":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
-			             "puppet:///apache2/common/etc/logrotate.d/apache2" ];
-
-		"/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("apache2/default-index.html");
-
-		# sometimes this is a symlink
-		#"/var/log/apache2":
-		#	mode    => 755,
-		#	ensure  => directory;
-	}
-
-	exec { "reload-apache2":
-               command => "/etc/init.d/apache2 reload",
-               refreshonly => true,
-        }
-
-        exec { "force-reload-apache2":
-               command => "/etc/init.d/apache2 force-reload",
-               refreshonly => true,
+
+	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))'
 	}
 }