BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209680
Change subject: beta: Remove custom apache2 log config
......................................................................
beta: Remove custom apache2 log config
Rather than writing combined logs to NFS shares, let logging work just
like it does in production. Error logs are sent to syslog and access
logs are written to local disk. Rsyslog has rules to write the error log
to local disk, forward to udp2log host and forward to logstash server.
Bug: T98289
Change-Id: I0cc51323343b7f1e1a7392558ffa771fb401b76a
---
D modules/mediawiki/files/apache/beta/logging.conf
M modules/mediawiki/manifests/web/beta_sites.pp
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/209680/1
diff --git a/modules/mediawiki/files/apache/beta/logging.conf
b/modules/mediawiki/files/apache/beta/logging.conf
deleted file mode 100644
index bbc080d..0000000
--- a/modules/mediawiki/files/apache/beta/logging.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# vim: sts=4 sw=4 syn=apache autoindent
-# Generic configuration file for logging
-#
-
-ErrorLog /data/project/logs/apache-error.log
-
-# Log with virtualhost prepended
-#CustomLog /data/project/logs/apache-access.log "%v %h %l %u %t \"%r\" %>s %b"
-# 20130722 hashar: added %A (apache IP) and X-Fowarded-Proto
-CustomLog /data/project/logs/apache-access.log "%A %v %h %l %u %t \"%r\" %>s
%b xfp: %{X-Forwarded-Proto}i"
-
-#LogLevel warn
-LogLevel notice
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
index 657097b..51578d8 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -91,9 +91,4 @@
priority => 20,
}
- apache::conf { 'logging':
- source => 'puppet:///modules/mediawiki/apache/beta/logging.conf',
- priority => 20,
- }
-
}
--
To view, visit https://gerrit.wikimedia.org/r/209680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc51323343b7f1e1a7392558ffa771fb401b76a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
