Dzahn has submitted this change and it was merged.

Change subject: zim: Move base::firewall include into the role
......................................................................


zim: Move base::firewall include into the role

Change-Id: I7b18e4f036ffc792d88e40bba090a8a989d8ab49
---
M manifests/role/dumps.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index 2497b4d..5520b7b 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -62,6 +62,7 @@
     system::role { 'dumps::zim': description => 'ZIM dumps' }
 
     include ::dumps::zim
+    include base::firewall
 
     ferm::service { 'zim_dumps_http':
         proto => 'tcp',
diff --git a/manifests/site.pp b/manifests/site.pp
index 8e0b25e..fafe24d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -990,7 +990,6 @@
     role dumps::zim
     include standard
     include admin
-    include base::firewall
 }
 
 # gadolinium is the webrequest socat multicast relay.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b18e4f036ffc792d88e40bba090a8a989d8ab49
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to