X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fsecurity_mirror.pp;h=fba5ad4742712079dd93079d2784177919cb865b;hb=50e655e2684e8460b982cc2432a993b810fc230e;hp=4d60da3aa5dad614313538f7672e802d11eb298d;hpb=b233cbf36fe50a47edd458cc29b8ba9806273e2c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index 4d60da3aa..fba5ad474 100644
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -1,12 +1,18 @@
 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["apache2 reload"];
+    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: