Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233971

Change subject: backup: Add IPv6 address of director in firewall rules
......................................................................

backup: Add IPv6 address of director in firewall rules

Add a configuration parameter for director's IPv6 address. Also amend
the rule::rule to a ferm::service stanza with the specified range

In the past, this worked fine, albeit with some delays due to IPv6 to
IPv4 fallback due to timeouts

Change-Id: I185a398e5f46afa724c400f86a64e8ffc5b88529
---
M manifests/role/backup.pp
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/233971/1

diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index b15b31b..38a4a36 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -7,6 +7,7 @@
     # we don't want to rely on DNS in firewall rules
     $director    = 'helium.eqiad.wmnet'
     $director_ip = '10.64.0.179'
+    $director_ip6 = '2620:0:861:101:10:64:0:179'
     $database = 'm1-master.eqiad.wmnet'
     $days = ['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri']
     $pool = 'production'
@@ -41,8 +42,10 @@
     File <| tag == 'backup-motd' |>
 
     # If the machine includes base::firewall then let director connect to us
-    ferm::rule { 'bacula-file-demon':
-        rule => "proto tcp dport 9102 { saddr 
${role::backup::config::director_ip} ACCEPT; }"
+    ferm::service { 'bacula-file-demon':
+        proto => 'tcp'
+        port  => '9102'
+        srange => "(${role::backup::config::director_ip} 
${role::backup::config::director_ip6})",
     }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/233971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I185a398e5f46afa724c400f86a64e8ffc5b88529
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to