Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389957 )
Change subject: wikibase: include apache class vs declaring it
......................................................................
wikibase: include apache class vs declaring it
Unfortunately this only works when the profile is applied
on a node that doesn't have other profiles using ::apache as well.
It will "add" a style violation but so far this has not been used
in prod and in labs it's a dedicated node.
So i will have to override jenkins-bot on this one (until we
have a general solution for all the ::apache includes, converting
apache module to defined types.
Bug: T99531
Change-Id: I35613fb66861b4f338e5f3470bccc49afb594d58
---
M modules/profile/manifests/microsites/wikibase.pp
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/profile/manifests/microsites/wikibase.pp
b/modules/profile/manifests/microsites/wikibase.pp
index 9f6c8c5..aeabda1 100644
--- a/modules/profile/manifests/microsites/wikibase.pp
+++ b/modules/profile/manifests/microsites/wikibase.pp
@@ -5,15 +5,14 @@
) {
include ::base::firewall
+ include ::apache
+ include ::apache::mod::headers
ferm::service { 'wikibase_http':
proto => 'tcp',
port => '80',
srange => '$CACHE_MISC',
}
-
- class { '::apache': }
- class { '::apache::mod::headers': }
apache::site { 'wikiba.se':
content => template('profile/wikibase/apache-wikibase.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/389957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35613fb66861b4f338e5f3470bccc49afb594d58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
