Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391616 )
Change subject: misc static sites: use profile::base::firewall ...................................................................... misc static sites: use profile::base::firewall Change-Id: Idcc999312c6b1ed09c2606fe87ad01e92b444dbf --- M modules/profile/manifests/microsites/annualreport.pp M modules/profile/manifests/microsites/static_bugzilla.pp M modules/profile/manifests/microsites/transparency.pp M modules/profile/manifests/microsites/wikibase.pp M modules/role/manifests/webserver_misc_static.pp 5 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/391616/1 diff --git a/modules/profile/manifests/microsites/annualreport.pp b/modules/profile/manifests/microsites/annualreport.pp index 01adc34..2aa9ff7 100644 --- a/modules/profile/manifests/microsites/annualreport.pp +++ b/modules/profile/manifests/microsites/annualreport.pp @@ -4,7 +4,6 @@ # T599 - https://15.wikipedia.org (aka. annual report 2015) class profile::microsites::annualreport { - include ::base::firewall include ::apache include ::apache::mod::headers diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp b/modules/profile/manifests/microsites/static_bugzilla.pp index f6135fc..fd0babc 100644 --- a/modules/profile/manifests/microsites/static_bugzilla.pp +++ b/modules/profile/manifests/microsites/static_bugzilla.pp @@ -1,7 +1,7 @@ # static HTML archive of old Bugzilla tickets class profile::microsites::static_bugzilla { + include ::bugzilla_static - include ::base::firewall ferm::service { 'bugzilla_static_http': proto => 'tcp', diff --git a/modules/profile/manifests/microsites/transparency.pp b/modules/profile/manifests/microsites/transparency.pp index 9a79098..7606b99 100644 --- a/modules/profile/manifests/microsites/transparency.pp +++ b/modules/profile/manifests/microsites/transparency.pp @@ -43,8 +43,6 @@ content => template('role/apache/sites/transparency.wikimedia.org.erb'), } - include ::base::firewall - ferm::service { 'transparency_http': proto => 'tcp', port => '80', diff --git a/modules/profile/manifests/microsites/wikibase.pp b/modules/profile/manifests/microsites/wikibase.pp index aeabda1..c7df33c 100644 --- a/modules/profile/manifests/microsites/wikibase.pp +++ b/modules/profile/manifests/microsites/wikibase.pp @@ -4,7 +4,6 @@ $server_admin = hiera('profile::microsites::wikibase::server_admin'), ) { - include ::base::firewall include ::apache include ::apache::mod::headers diff --git a/modules/role/manifests/webserver_misc_static.pp b/modules/role/manifests/webserver_misc_static.pp index 5ca5e9c..435616d 100644 --- a/modules/role/manifests/webserver_misc_static.pp +++ b/modules/role/manifests/webserver_misc_static.pp @@ -2,6 +2,7 @@ class role::webserver_misc_static { include ::standard + include ::profile::base::firewall include ::apache include ::apache::mod::authnz_ldap -- To view, visit https://gerrit.wikimedia.org/r/391616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcc999312c6b1ed09c2606fe87ad01e92b444dbf 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
