Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391653 )

Change subject: RT,releases: use profile::base::firewall
......................................................................

RT,releases: use profile::base::firewall

Change-Id: Id44ed9822b9e82c9beeab5fca8fd50987dd82543
---
M modules/profile/manifests/requesttracker/server.pp
M modules/role/manifests/releases.pp
M modules/role/manifests/requesttracker_server.pp
3 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/391653/1

diff --git a/modules/profile/manifests/requesttracker/server.pp 
b/modules/profile/manifests/requesttracker/server.pp
index 56a8185..e38fae6 100644
--- a/modules/profile/manifests/requesttracker/server.pp
+++ b/modules/profile/manifests/requesttracker/server.pp
@@ -19,8 +19,6 @@
         dbpass      => $passwords::misc::rt::rt_mysql_pass,
     }
 
-    include ::base::firewall
-
     ferm::service { 'rt-http':
         proto  => 'tcp',
         port   => '80',
diff --git a/modules/role/manifests/releases.pp 
b/modules/role/manifests/releases.pp
index 426ddec..826f26f 100644
--- a/modules/role/manifests/releases.pp
+++ b/modules/role/manifests/releases.pp
@@ -9,7 +9,7 @@
     }
 
     include ::standard
-    include ::base::firewall
+    include ::profile::base::firewall
     include ::profile::backup::host
     include ::profile::releases::mediawiki
     include ::profile::releases::reprepro
diff --git a/modules/role/manifests/requesttracker_server.pp 
b/modules/role/manifests/requesttracker_server.pp
index 53679d4..1fe36bc 100644
--- a/modules/role/manifests/requesttracker_server.pp
+++ b/modules/role/manifests/requesttracker_server.pp
@@ -2,6 +2,7 @@
 class role::requesttracker_server {
 
     include ::standard
+    include ::profile::base::firewall
     include ::profile::requesttracker::server
 
     system::role { 'requesttracker::server':

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

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

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

Reply via email to