Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402172 )
Change subject: peopleweb/publichtml: use module httpd
......................................................................
peopleweb/publichtml: use module httpd
Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
---
M modules/profile/manifests/microsites/peopleweb.pp
M modules/publichtml/manifests/init.pp
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/microsites/peopleweb.pp
b/modules/profile/manifests/microsites/peopleweb.pp
index 8ccebb2..bf40a6c 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,10 @@
# let users publish their own HTML in their home dirs
class profile::microsites::peopleweb {
+ class { '::httpd':
+ modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
+ }
+
class { '::publichtml':
sitename => 'people.wikimedia.org',
server_admin => 'n...@wikimedia.org',
diff --git a/modules/publichtml/manifests/init.pp
b/modules/publichtml/manifests/init.pp
index bbc46fc..bcc4f3f 100644
--- a/modules/publichtml/manifests/init.pp
+++ b/modules/publichtml/manifests/init.pp
@@ -5,17 +5,12 @@
$docroot = '/srv/org/wikimedia/publichtml',
$server_admin = undef,
) {
- include ::apache::mod::userdir
- include ::apache::mod::cgi
- include ::apache::mod::php5
- include ::apache::mod::rewrite
- include ::apache::mod::headers
system::role { 'publichtml':
description => 'web server of public_html directories',
}
- apache::site { $sitename:
+ httpd::site { $sitename:
content => template('publichtml/apacheconfig.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/402172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
