Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402168 )
Change subject: webserver_misc_static: switch apache to module httpd ...................................................................... webserver_misc_static: switch apache to module httpd Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d --- 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, 22 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/402168/1 diff --git a/modules/profile/manifests/microsites/annualreport.pp b/modules/profile/manifests/microsites/annualreport.pp index 2aa9ff7..89fb2b0 100644 --- a/modules/profile/manifests/microsites/annualreport.pp +++ b/modules/profile/manifests/microsites/annualreport.pp @@ -4,8 +4,9 @@ # T599 - https://15.wikipedia.org (aka. annual report 2015) class profile::microsites::annualreport { - include ::apache - include ::apache::mod::headers + class {'::httpd': + modules => ['headers'], + } ferm::service { 'annualreport_http': proto => 'tcp', @@ -13,11 +14,11 @@ srange => '$CACHE_MISC', } - apache::site { 'annual.wikimedia.org': + httpd::site { 'annual.wikimedia.org': source => 'puppet:///modules/profile/annualreport/annual.wikimedia.org', } - apache::site { '15.wikipedia.org': + httpd::site { '15.wikipedia.org': source => 'puppet:///modules/profile/annualreport/15.wikipedia.org', } diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp b/modules/profile/manifests/microsites/static_bugzilla.pp index fd0babc..e7799b5 100644 --- a/modules/profile/manifests/microsites/static_bugzilla.pp +++ b/modules/profile/manifests/microsites/static_bugzilla.pp @@ -1,6 +1,10 @@ # static HTML archive of old Bugzilla tickets class profile::microsites::static_bugzilla { + class {'::httpd': + modules => ['headers', 'rewrite'], + } + include ::bugzilla_static ferm::service { 'bugzilla_static_http': diff --git a/modules/profile/manifests/microsites/transparency.pp b/modules/profile/manifests/microsites/transparency.pp index 7606b99..46a8984 100644 --- a/modules/profile/manifests/microsites/transparency.pp +++ b/modules/profile/manifests/microsites/transparency.pp @@ -3,6 +3,10 @@ # class profile::microsites::transparency { + class {'::httpd': + modules => ['headers', 'authnz_ldap'], + } + include ::passwords::misc::private_static_site include ::passwords::ldap::production @@ -39,7 +43,7 @@ ], } - apache::site { 'transparency.wikimedia.org': + httpd::site { 'transparency.wikimedia.org': content => template('role/apache/sites/transparency.wikimedia.org.erb'), } diff --git a/modules/profile/manifests/microsites/wikibase.pp b/modules/profile/manifests/microsites/wikibase.pp index c7df33c..316f487 100644 --- a/modules/profile/manifests/microsites/wikibase.pp +++ b/modules/profile/manifests/microsites/wikibase.pp @@ -4,8 +4,9 @@ $server_admin = hiera('profile::microsites::wikibase::server_admin'), ) { - include ::apache - include ::apache::mod::headers + class {'::httpd': + modules => ['headers'], + } ferm::service { 'wikibase_http': proto => 'tcp', @@ -13,7 +14,7 @@ srange => '$CACHE_MISC', } - apache::site { 'wikiba.se': + httpd::site { 'wikiba.se': content => template('profile/wikibase/apache-wikibase.erb'), } diff --git a/modules/role/manifests/webserver_misc_static.pp b/modules/role/manifests/webserver_misc_static.pp index 435616d..0b457c9 100644 --- a/modules/role/manifests/webserver_misc_static.pp +++ b/modules/role/manifests/webserver_misc_static.pp @@ -1,20 +1,16 @@ # a webserver for misc. static sites class role::webserver_misc_static { + system::role { 'webserver_misc_static': + description => 'WMF misc sites web server' + } + include ::standard include ::profile::base::firewall - - include ::apache - include ::apache::mod::authnz_ldap - include ::apache::mod::rewrite - include ::apache::mod::headers include ::profile::microsites::annualreport # https://annual.wikimedia.org include ::profile::microsites::static_bugzilla # https://static-bugzilla.wikimedia.org include ::profile::microsites::transparency # https://transparency.wikimedia.org include ::profile::microsites::wikibase # https://wikiba.se - system::role { 'webserver_misc_static': - description => 'WMF misc sites web server' - } } -- To view, visit https://gerrit.wikimedia.org/r/402168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
