Muehlenhoff has submitted this change and it was merged.

Change subject: udp2log: Restrict to domain networks
......................................................................


udp2log: Restrict to domain networks

INTERNAL is needlessly broad, use DOMAIN_NETWORKS to allow to use it in
production and labs networks.

Also drop the !defined check, which isn't needed (also it's typoed as
Ferm::Serivce)

Change-Id: I5f6b0ab03f9fe58f50923a843974e64a720b9eae
---
M modules/udp2log/manifests/instance.pp
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Ottomata: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/udp2log/manifests/instance.pp 
b/modules/udp2log/manifests/instance.pp
index 466df03..fa63131 100644
--- a/modules/udp2log/manifests/instance.pp
+++ b/modules/udp2log/manifests/instance.pp
@@ -97,12 +97,10 @@
         ],
     }
 
-    if !defined(Ferm::Serivce["udp2log_instance_${port}"]) {
-        ferm::service { "udp2log_instance_${port}":
-            proto  => 'udp',
-            port   => $port,
-            srange => '$INTERNAL',
-        }
+    ferm::service { "udp2log_instance_${port}":
+        proto  => 'udp',
+        port   => $port,
+        srange => '$DOMAIN_NETWORKS',
     }
 
     # only set up instance monitoring if the monitoring scripts are installed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f6b0ab03f9fe58f50923a843974e64a720b9eae
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to