projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fasch and field
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
security_mirror.pp
diff --git
a/modules/apache2/manifests/security_mirror.pp
b/modules/apache2/manifests/security_mirror.pp
index
ee20e9d
..
85adcf1
100644
(file)
--- 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",
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;
+ }
+
}
}