Yuvipanda has submitted this change and it was merged.
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
A modules/releases/templates/apache.conf.erb
3 files changed, 28 insertions(+), 23 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index 3fe0fbb..464f5c3 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -10,7 +10,6 @@
class { '::releases':
sitename => 'releases.wikimedia.org',
- docroot => 'releases',
}
class { '::releases::reprepro': }
diff --git a/modules/releases/manifests/init.pp
b/modules/releases/manifests/init.pp
index fafa3f2..241956a 100644
--- a/modules/releases/manifests/init.pp
+++ b/modules/releases/manifests/init.pp
@@ -23,37 +23,23 @@
class releases (
$sitename = undef,
- $docroot = undef,
$server_admin = '[email protected]',
) {
- file { '/srv/org':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
- file { '/srv/org/wikimedia':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
- file { "/srv/org/wikimedia/${docroot}":
+ file { [
+ '/srv/org',
+ '/srv/org/wikimedia/',
+ '/srv/org/wikimedia/releases',
+ ]:
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
diff --git a/modules/releases/templates/apache.conf.erb
b/modules/releases/templates/apache.conf.erb
new file mode 100644
index 0000000..527fa7e
--- /dev/null
+++ b/modules/releases/templates/apache.conf.erb
@@ -0,0 +1,20 @@
+<VirtualHost *:80>
+ ServerName <%= @sitename %>
+ ServerAdmin <%= @server_admin %>
+
+ DocumentRoot /srv/org/wikimedia/releases/
+ <Directory /srv/org/wikimedia/releases/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+
+ ErrorLog /var/log/apache2/<%= @sitename %>.error.log
+
+ LogLevel warn
+
+ CustomLog /var/log/apache2/<%= @sitename %>.access.log combined
+ ServerSignature On
+</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/253478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05792f76d8a272e37cbc14c85369332f66a95d20
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
