Remove sites-available/common-ssl.inc

diff --git a/modules/apache2/files/common-ssl.inc b/modules/apache2/files/common-ssl.inc
deleted file mode 100644 (file)
index cc281ee..0000000
--- a/modules/apache2/files/common-ssl.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-
-#   SSL Engine Switch:
-#   Enable/Disable SSL for this virtual host.
-SSLEngine on
-
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#   
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
-#   Add STS
-Header add Strict-Transport-Security "max-age=604800"
-

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a3d47f1a0c00ac4dd3e2892f58db545a7121cbcb..a475f63ce4805ec240cf16afbf0006004f6d4d22 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -53,9 +53,7 @@ class apache2 {
        }
 
        file { '/etc/apache2/sites-available/common-ssl.inc':
-               source => 'puppet:///modules/apache2/common-ssl.inc',
-               require => Package['apache2'],
-               notify  => Service['apache2'],
+               ensure => absent,
        }
 
        file { '/etc/logrotate.d/apache2':