X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_base.pp;h=8a92526601ed53cf2f6d0e791ba989e2aa443f28;hb=4939162b3524926ead9e4a832c314b78d379b770;hp=ed1f55f2520f1997153525e6a532ab5976d162d2;hpb=02468c9711c0cf6297d6057f9ba5ed78af11be83;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
index ed1f55f25..8a9252660 100644
--- a/modules/roles/manifests/static_base.pp
+++ b/modules/roles/manifests/static_base.pp
@@ -7,7 +7,7 @@ class roles::static_base {
 	}
 
 	file { '/etc/static-components.conf':
-		source => 'puppet:///modules/roles/static-mirroring/static-components.conf',
+		content => template('roles/static-mirroring/static-components.conf.erb'),
 	}
 
 	file { '/etc/ssh/userkeys/staticsync':
@@ -23,13 +23,13 @@ class roles::static_base {
 
 	@ferm::rule { 'dsa-static-bt-v4':
 		description => 'Allow bt between static hosts',
-		rule        => 'proto tcp mod state state (NEW) mod multiport destination-ports (6881-6999) @subchain \'static-bt\' { saddr ($HOST_STATIC_V4) ACCEPT; }',
+		rule        => 'proto tcp mod state state (NEW) mod multiport destination-ports (6881:6999) @subchain \'static-bt\' { saddr ($HOST_STATIC_V4) ACCEPT; }',
 		notarule    => true,
 	}
 	@ferm::rule { 'dsa-static-bt-v6':
 		description => 'Allow bt between static hosts',
 		domain      => 'ip6',
-		rule        => 'proto tcp mod state state (NEW) mod multiport destination-ports (6881-6999) @subchain \'static-bt\' { saddr ($HOST_STATIC_V6) ACCEPT; }',
+		rule        => 'proto tcp mod state state (NEW) mod multiport destination-ports (6881:6999) @subchain \'static-bt\' { saddr ($HOST_STATIC_V6) ACCEPT; }',
 		notarule    => true,
 	}
 }