Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154710
Change subject: mediawiki: use 'udplog' service alias instead of hard-coding
fluorine
......................................................................
mediawiki: use 'udplog' service alias instead of hard-coding fluorine
Service alias added in Gerrit change I33d3e4a58.
On Labs, there is no service alias, but there is an instance called 'udplog',
so it resolves just as well.
Change-Id: Iaa23f0ee8dffebb149ceaf12d0da2f8d96e16585
---
M manifests/role/beta.pp
M manifests/role/mediawiki.pp
R modules/mediawiki/files/php/wmerrors.ini
A modules/mediawiki/files/rsyslog.conf
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/php.pp
D modules/mediawiki/manifests/syslog.pp
M modules/mediawiki/manifests/web.pp
8 files changed, 34 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/154710/1
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index a779fd8..2ffa5e1 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -90,14 +90,6 @@
include ::beta::common
- class { '::mediawiki::syslog':
- log_aggregator => 'deployment-bastion.eqiad.wmflabs:8420',
- }
-
- class { '::mediawiki::php':
- fatal_log_file => 'udp://deployment-bastion.eqiad.wmflabs:8420',
- }
-
class { '::mediawiki::web': }
apache::site { 'beta_cluster':
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 952e75d..8d76c9e 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -43,10 +43,6 @@
},
},
}
-
- $log_aggregator = 'fluorine.eqiad.wmnet:8420'
- class { '::mediawiki::php': fatal_log_file => "udp://${log_aggregator}"
}
- class { '::mediawiki::syslog': log_aggregator => $log_aggregator }
}
class role::mediawiki::webserver( $pool, $workers_limit = undef ) {
diff --git a/modules/mediawiki/templates/php/wmerrors.ini.erb
b/modules/mediawiki/files/php/wmerrors.ini
similarity index 80%
rename from modules/mediawiki/templates/php/wmerrors.ini.erb
rename to modules/mediawiki/files/php/wmerrors.ini
index 8ac78ac..580fb40 100644
--- a/modules/mediawiki/templates/php/wmerrors.ini.erb
+++ b/modules/mediawiki/files/php/wmerrors.ini
@@ -1,8 +1,6 @@
extension=wmerrors.so
-
wmerrors.enabled=On
-
wmerrors.message_file=/usr/local/apache/common-local/php-fatal-error.html
-wmerrors.log_file=<%= fatal_log_file %>
+wmerrors.log_file=udp://udplog:8420
wmerrors.log_backtrace=On
wmerrors.log_line_prefix="fatal "
diff --git a/modules/mediawiki/files/rsyslog.conf
b/modules/mediawiki/files/rsyslog.conf
new file mode 100644
index 0000000..8a7042b
--- /dev/null
+++ b/modules/mediawiki/files/rsyslog.conf
@@ -0,0 +1,17 @@
+# rsyslog configuration for MediaWiki on Apache
+# This file is managed by Puppet
+
+# Emulate MediaWiki's wfDebugLog / wfErrorLog format
+$template MediaWiki,"%programname% %timegenerated% %HOSTNAME%: %msg%\n"
+
+# Maximum 100MB log file size
+$outchannel apache2,/var/log/apache2.log,100000000,/usr/sbin/logrotate -f
/etc/logrotate.d/mediawiki_apache
+
+# Send apache2 messages to the apache output channel
+:programname,isequal,"apache2" $apache2
+
+# ..and to the MediaWiki log aggregator
+& @udplog:8420;MediaWiki
+
+# Discard apache2 messages before they get to 50-default.conf
+& ~
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index e770d35..2a25f46 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -8,6 +8,8 @@
if ubuntu_version('>= trusty') {
include ::mediawiki::hhvm
+ } else {
+ include ::mediawiki::php
}
file { '/etc/cluster':
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 3c1121b..db78ada 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -1,12 +1,4 @@
-# Configuration files for php5 running on application servers
-#
-# **fatal_log_file**
-# Where to send PHP fatal traces.
-#
-# requires mediawiki::packages to be in place
-class mediawiki::php(
- $fatal_log_file='udp://10.64.0.21:8420'
-) {
+class mediawiki::php {
include ::mediawiki::packages
file { '/etc/php5/apache2/php.ini':
@@ -56,7 +48,7 @@
}
file { '/etc/php5/conf.d/wmerrors.ini':
- content => template('mediawiki/php/wmerrors.ini.erb'),
+ source => 'puppet:///modules/mediawiki/php/wmerrors.ini',
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/mediawiki/manifests/syslog.pp
b/modules/mediawiki/manifests/syslog.pp
deleted file mode 100644
index 3a543c1..0000000
--- a/modules/mediawiki/manifests/syslog.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# syslog instance and configuration for applicationservers
-class mediawiki::syslog( $log_aggregator ) {
- rsyslog::conf { 'mediawiki':
- content => template('mediawiki/rsyslog.conf.erb'),
- priority => 40, # before 50-default.conf
- }
-
- file { '/etc/logrotate.d/mediawiki_apache':
- source => 'puppet:///modules/mediawiki/logrotate.d_mediawiki_apache',
- owner => 'root',
- group => 'root',
- mode => '0444',
- before => Rsyslog::Conf['mediawiki'],
- }
-}
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index f483d1c..8d8df78 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -47,4 +47,16 @@
if ubuntu_version('>= trusty') {
apache::def { 'HHVM': }
}
+
+ file { '/etc/logrotate.d/mediawiki_apache':
+ source => 'puppet:///modules/mediawiki/logrotate.d_mediawiki_apache',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+
+ rsyslog::conf { 'mediawiki_apache':
+ source => 'puppet:///modules/mediawiki/rsyslog.conf',
+ priority => 40,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/154710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa23f0ee8dffebb149ceaf12d0da2f8d96e16585
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
