]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/apache2/manifests/init.pp
reload apache2 on sso RP hosts after sso files changed
[dsa-puppet.git] / modules / apache2 / manifests / init.pp
index 6235ed3a212e7e3edb621e667b12ca7e0d8b3b1c..8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707 100644 (file)
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
-        include munin-node::apache
-
-       package {
-               "apache2": ensure => installed;
-               "logrotate": ensure => installed;
-       }
-
-        case $php5 {
-                "true": { package {
-                               "php5-suhosin": ensure => installed;
-                       }
-                          file { "/etc/php5/conf.d/suhosin.ini":
-                                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini",
-                                                    "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ],
-                                       require => Package["apache2", "php5-suhosin"],
-                                        notify  => Exec["force-reload-apache2"];
-                       }
+       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 { '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'),
+       }
+
+       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-config':
+               content => template('apache2/puppet-config.erb'),
+       }
+
+       apache2::config { 'pratchett':
+               source => 'puppet:///modules/apache2/pratchett',
+       }
+
+       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,
+       }
+
+       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))'
+       }
 
-        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,
-       }
-        @ferm::rule { "dsa-apache":
-                domain          => "(ip ip6)",
-                description     => "Allow web access",
-                rule            => "&SERVICE(tcp, 80)"
-        }
+       exec { 'service apache2 reload':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'service apache2 reload',
+               refreshonly => true,
+               require =>  Package['apache2'],
+       }
 }