Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247262
Change subject: bromine: Move the base::firewall includes into the roles
......................................................................
bromine: Move the base::firewall includes into the roles
Change-Id: Ib628438876309c08744d87b0f657bde7567cfbf3
---
M manifests/role/annualreport.pp
M manifests/role/bugzilla_static.pp
M manifests/role/transparency.pp
M manifests/site.pp
4 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/247262/1
diff --git a/manifests/role/annualreport.pp b/manifests/role/annualreport.pp
index d686a94..3b1bd4b 100644
--- a/manifests/role/annualreport.pp
+++ b/manifests/role/annualreport.pp
@@ -6,6 +6,7 @@
system::role { 'role::annualreport': description => 'WMF Annual report
server - annual.wikimedia.org' }
include ::annualreport
+ include base::firewall
ferm::service { 'annualreport_http':
proto => 'tcp',
diff --git a/manifests/role/bugzilla_static.pp
b/manifests/role/bugzilla_static.pp
index ae27239..921d7e8 100644
--- a/manifests/role/bugzilla_static.pp
+++ b/manifests/role/bugzilla_static.pp
@@ -2,6 +2,7 @@
# role for a Bugzilla server
class role::bugzilla_static {
+ include base::firewall
system::role { 'role::bugzilla_static': description => 'Static HTML
Bugzilla server' }
ferm::service { 'bugzilla_static_http':
diff --git a/manifests/role/transparency.pp b/manifests/role/transparency.pp
index 9b177b9..bb761ad 100644
--- a/manifests/role/transparency.pp
+++ b/manifests/role/transparency.pp
@@ -7,6 +7,7 @@
include ::apache
include ::apache::mod::rewrite
include ::apache::mod::headers
+ include base::firewall
$repo_dir = '/srv/org/wikimedia/TransparencyReport'
$docroot = "${repo_dir}/build"
diff --git a/manifests/site.pp b/manifests/site.pp
index 60f09c0..11c69d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -283,7 +283,6 @@
# virtual machine for static misc. services
node 'bromine.eqiad.wmnet' {
include standard
- include base::firewall
include role::bugzilla_static
include role::annualreport
include role::transparency
--
To view, visit https://gerrit.wikimedia.org/r/247262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib628438876309c08744d87b0f657bde7567cfbf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
