Dzahn has submitted this change and it was merged.
Change subject: contint: Split up apache logs by vhost
......................................................................
contint: Split up apache logs by vhost
We had logs in access.log and some of them in other_vhosts_access.log.
That is a bit confusing when tailing the log files.
This patch creates three new access log files with they error files
counterparts:
doc_access.log : doc.(mediawiki|wikimedia).org
integration_access.log : integration.(mediawiki|wikimedia).org
qunit_access.log : for qunit.localhost (that is the QUnit tests being
run in a headless browser).
Still have to fix the Jenkins and Zuul proxies to log to different files
but that will be in another patch :)
Change-Id: I53c01978e509cf27b5b12d73e10088736d071757
---
M modules/contint/files/apache/doc.wikimedia.org
M modules/contint/files/apache/integration.mediawiki.org
M modules/contint/files/apache/integration.wikimedia.org
M modules/contint/files/apache/qunit.localhost
4 files changed, 30 insertions(+), 10 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/contint/files/apache/doc.wikimedia.org
b/modules/contint/files/apache/doc.wikimedia.org
index a9cacba..4ce7c06 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -7,11 +7,19 @@
<VirtualHost *:80>
ServerName doc.mediawiki.org
+ LogLevel warn
+ ErrorLog /var/log/apache2/doc_error.log
+ CustomLog /var/log/apache2/doc_access.log vhost_combined
+
Redirect permanent / https://doc.wikimedia.org/
</VirtualHost>
<VirtualHost *:443>
ServerName doc.mediawiki.org
+
+ LogLevel warn
+ ErrorLog /var/log/apache2/doc_error.log
+ CustomLog /var/log/apache2/doc_access.log vhost_combined
SSLEngine on
SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem
@@ -24,6 +32,10 @@
<VirtualHost *:80>
ServerName doc.wikimedia.org
+ LogLevel warn
+ ErrorLog /var/log/apache2/doc_error.log
+ CustomLog /var/log/apache2/doc_access.log vhost_combined
+
Redirect permanent / https://doc.wikimedia.org/
</VirtualHost>
@@ -33,9 +45,9 @@
DocumentRoot /srv/org/wikimedia/doc
- ErrorLog /var/log/apache2/error.log
LogLevel warn
- CustomLog /var/log/apache2/access.log combined
+ ErrorLog /var/log/apache2/doc_error.log
+ CustomLog /var/log/apache2/doc_access.log vhost_combined
SSLEngine on
SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
diff --git a/modules/contint/files/apache/integration.mediawiki.org
b/modules/contint/files/apache/integration.mediawiki.org
index 28bf24a..9f99a0e 100644
--- a/modules/contint/files/apache/integration.mediawiki.org
+++ b/modules/contint/files/apache/integration.mediawiki.org
@@ -8,6 +8,10 @@
<VirtualHost *:80>
ServerName integration.mediawiki.org
+ LogLevel warn
+ ErrorLog /var/log/apache2/integration_error.log
+ CustomLog /var/log/apache2/integration_access.log vhost_combined
+
Redirect permanent / https://integration.wikimedia.org/
</VirtualHost>
<VirtualHost *:443>
@@ -18,5 +22,9 @@
SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key
SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
+ LogLevel warn
+ ErrorLog /var/log/apache2/integration_error.log
+ CustomLog /var/log/apache2/integration_access.log vhost_combined
+
Redirect permanent / https://integration.wikimedia.org/
</VirtualHost>
diff --git a/modules/contint/files/apache/integration.wikimedia.org
b/modules/contint/files/apache/integration.wikimedia.org
index 94e5e49..6fd883f 100644
--- a/modules/contint/files/apache/integration.wikimedia.org
+++ b/modules/contint/files/apache/integration.wikimedia.org
@@ -8,6 +8,10 @@
<VirtualHost *:80>
ServerName integration.wikimedia.org
+ LogLevel warn
+ ErrorLog /var/log/apache2/integration_error.log
+ CustomLog /var/log/apache2/integration_access.log vhost_combined
+
# Force Jenkins request through HTTPS
Redirect permanent / https://integration.wikimedia.org/
</VirtualHost>
@@ -23,13 +27,9 @@
SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
LogLevel warn
-
- CustomLog /var/log/apache2/access.log combined
+ ErrorLog /var/log/apache2/integration_error.log
+ CustomLog /var/log/apache2/integration_access.log vhost_combined
<Directory />
Order Deny,Allow
diff --git a/modules/contint/files/apache/qunit.localhost
b/modules/contint/files/apache/qunit.localhost
index 9181fe9..344201e 100644
--- a/modules/contint/files/apache/qunit.localhost
+++ b/modules/contint/files/apache/qunit.localhost
@@ -27,7 +27,7 @@
Allow from ::1/128
</Directory>
- ErrorLog /var/log/apache2/error.log
LogLevel warn
- CustomLog /var/log/apache2/access.log combined
+ ErrorLog /var/log/apache2/qunit_error.log
+ CustomLog /var/log/apache2/qunit_access.log vhost_combined
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/61195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53c01978e509cf27b5b12d73e10088736d071757
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
