Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/253478
Change subject: releases: Move from webserver module to apache module
......................................................................
releases: Move from webserver module to apache module
The webserver module is deprecated and must die
Bug: T118786
Change-Id: I05792f76d8a272e37cbc14c85369332f66a95d20
---
M manifests/role/releases.pp
M modules/releases/manifests/init.pp
2 files changed, 5 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/253478/1
diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index a89fbbc..0ec2213 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -11,7 +11,7 @@
class { '::releases':
sitename => 'releases.wikimedia.org',
- docroot => 'releases',
+ docroot => '/srv/org/wikimedia/releases',
}
class { '::releases::reprepro': }
diff --git a/modules/releases/manifests/init.pp
b/modules/releases/manifests/init.pp
index fafa3f2..735cd39 100644
--- a/modules/releases/manifests/init.pp
+++ b/modules/releases/manifests/init.pp
@@ -38,22 +38,17 @@
group => 'root',
mode => '0755',
}
- file { "/srv/org/wikimedia/${docroot}":
+ file { $docroot:
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
- include 'webserver::apache'
include ::apache::mod::rewrite
- @webserver::apache::site { $sitename:
- docroot => "/srv/org/wikimedia/${docroot}/",
- server_admin => $server_admin,
- require => [
- Class['::apache::mod::rewrite'],
- File['/srv/org/wikimedia/releases']
- ],
+
+ apache::site { $sitename:
+ content => template('releases/apache.conf.erb'),
}
# T94486
--
To view, visit https://gerrit.wikimedia.org/r/253478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05792f76d8a272e37cbc14c85369332f66a95d20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
