Move security-tracker cert to puppet

[dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fad6b087a436751f643a1ef183d5263ec6fb78dd..ef8a24794ec807f6ad9aff74755b93d61441baa5 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -58,8 +58,12 @@ class roles {
                include roles::keyring
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
+       }
+
+       if getfromhash($site::nodeinfo, 'syncproxy') {
+               include roles::syncproxy
        }
 
        if getfromhash($site::nodeinfo, 'static_master') {
@@ -83,4 +87,10 @@ class roles {
        if $::hostname in [ravel] {
                include roles::weblog_destination
        }
+
+       if $::hostname in [soler] {
+               ssl::service { 'security-tracker.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 }