Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403734 )
Change subject: releases-mediawiki: replace apache module with httpd
......................................................................
releases-mediawiki: replace apache module with httpd
Change-Id: Ic69c5967e8305d370b4887e46e1df476f5308d33
---
M modules/profile/manifests/releases/mediawiki.pp
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/releases/mediawiki.pp
b/modules/profile/manifests/releases/mediawiki.pp
index 2c49f70..3fc413c 100644
--- a/modules/profile/manifests/releases/mediawiki.pp
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -26,16 +26,15 @@
class { '::contint::composer': }
class { '::contint::packages::php': }
- class { '::apache::mod::rewrite': }
- class { '::apache::mod::headers': }
- class { '::apache::mod::proxy': }
- class { '::apache::mod::proxy_http': }
+ class { '::httpd':
+ modules => ['rewrite', 'headers', 'proxy', 'proxy_http'],
+ }
- apache::site { $sitename:
+ httpd::site { $sitename:
content => template('releases/apache.conf.erb'),
}
- apache::site { $sitename_jenkins:
+ httpd::site { $sitename_jenkins:
content => template('releases/apache-jenkins.conf.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/403734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic69c5967e8305d370b4887e46e1df476f5308d33
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
