sibelius nfs on public net

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ce7c927..5f289cb 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -87,10 +87,6 @@ class apache2 {
                content => template('apache2/puppet-config.erb'),
        }
 
-       apache2::config { 'pratchett':
-               ensure => 'absent',
-       }
-
        apache2::config { 'headers':
                source => 'puppet:///modules/apache2/headers',
        }
@@ -111,27 +107,10 @@ class apache2 {
                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', '/srv/www/default.debian.org/htdocs-disabled' ]:
-               ensure  => directory,
-               mode    => '0755',
-       }
-
-       file { '/srv/www/default.debian.org/htdocs/index.html':
-               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':
                ensure => directory,
                mode   => '0755',