X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fsecurity_mirror.pp;h=85adcf1de49b788c19ca3205a97f944970aa0ea3;hb=44ce3cff49b71e9c60c07751088c64467fca4bb5;hp=ee20e9d9eb8c9c2662c0ba258754833b71c93ffb;hpb=db83e9ae718d90fdb9f27a3d9e5ed23931fc8abb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index ee20e9d9e..85adcf1de 100644
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -2,11 +2,14 @@ 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"];
+                                    "puppet:///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;
+       }
+
 }