X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fsecurity_mirror.pp;h=853b9f89660035344eed69f81277060919f4f648;hb=103df6353b04261dda4f6db60925961f0a9cce5c;hp=ee20e9d9eb8c9c2662c0ba258754833b71c93ffb;hpb=db83e9ae718d90fdb9f27a3d9e5ed23931fc8abb;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index ee20e9d9..853b9f89 100644
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -1,12 +1,19 @@
-class apache2::security_mirror inherits apache2 {
-       file {
-               "/etc/apache2/sites-available/security.debian.org":
-                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
-                                    "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ],
-                       require => Package["apache2"],
-                       notify  => Exec["reload-apache2"];
+class apache2::security_mirror {
+    include apache2
+    file {
+        "/etc/apache2/sites-available/security.debian.org":
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
+                         "puppet:///modules/apache2/common/etc/apache2/sites-available/security.debian.org" ];
 
-       }
+    }
+
+    activate_apache_site {
+        "010-security.debian.org": site => "security.debian.org";
+        "security.debian.org": ensure => absent;
+    }
 
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: