X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=af7c23d9c73b278aac50d85d2f512996f7cd4654;hb=7439479a5603cef1d7744d445d8f0aaf9b697db2;hp=70b6722235aac29de06dd675648677a65298ab48;hpb=0d5176e1034bd04ce9c76d790caa819f8b8d5341;p=mirror%2Fdsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index 70b672223..af7c23d9c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -14,6 +14,8 @@ Exec { } node default { + $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") + include munin-node include sudo include ssh @@ -21,8 +23,6 @@ node default { include monit include apt-keys - $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") - include motd include samhain @@ -60,6 +60,11 @@ node default { "true": { include buildd } default: { } } + case extractnodeinfo($nodeinfo, 'apache2_security_mirror') { + "true": { include apache2::security_mirror } + default: { } + } + # maybe wait for rietz to be upgraded to lenny # case $hostname {