X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Ftcp_bbr%2Fmanifests%2Finit.pp;h=22ee67628dd8420a84c8dba4df26d2d7f61c929d;hb=46be0972475f02f51cfda7c1acc0d775faef9efa;hp=a4860753d8634d94270e582b7c8b811cbc90ddc7;hpb=12d75e21acac497f54af681a244c8bcf9a20640b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/tcp_bbr/manifests/init.pp b/modules/tcp_bbr/manifests/init.pp
index a4860753d..22ee67628 100644
--- a/modules/tcp_bbr/manifests/init.pp
+++ b/modules/tcp_bbr/manifests/init.pp
@@ -11,7 +11,6 @@ class tcp_bbr {
 		   has_role('debian_mirror') or
 		   has_role('debug_mirror') or
 		   has_role('dgit_git') or
-		   has_role('ftp.d.o') or
 		   has_role('ftp.upload.d.o') or
 		   has_role('ftp_master') or
 		   has_role('git_master') or
@@ -25,21 +24,21 @@ class tcp_bbr {
 		   has_role('security_mirror') or
 		   has_role('security_upload') or
 		   has_role('ssh.upload.d.o') or
-		   has_role('static_master') or
-		   has_role('static_mirror') or
-		   has_role('static_source') or
+		   defined(Class["staticync::static_master"]) or
+		   defined(Class["staticync::static_mirror"]) or
+		   defined(Class["staticync::static_source"]) or
 		   has_role('syncproxy') or
 		   has_role('www_master') or
 		   false {
 
-			site::linux_module { 'tcp_bbr': }
-			site::linux_module { 'sch_fq': }
+			base::linux_module { 'tcp_bbr': }
+			base::linux_module { 'sch_fq': }
 
-			site::sysctl { 'puppet-net_core_default_qdisc':
+			base::sysctl { 'puppet-net_core_default_qdisc':
 				key   => 'net.core.default_qdisc',
 				value => 'fq',
 			}
-			site::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
+			base::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
 				key   => 'net.ipv4.tcp_congestion_control',
 				value => 'bbr',
 			}