r22130 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r22129‎ | r22130 | r22131 >
Date:19:28, 12 May 2007
Author:river
Status:old
Tags:
Comment:
wikimedia-apache-config-appserver (1.2) feisty; urgency=low

* Load some required modules.
* Log to the right place (/usr/local/apache/logs)
Modified paths:
  • /trunk/debs/wikimedia-apache-config-appserver/apache2.conf (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/debian/changelog (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/debian/files (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/foundation.conf (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/nonexistent.conf (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/remnant.conf (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/wikimedia.conf (modified) (history)
  • /trunk/debs/wikimedia-apache-config-appserver/www.wikipedia.conf (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-apache-config-appserver/debian/files
——@@ -1 +1 @@
2 -wikimedia-apache-config-appserver_1.0_all.deb unknown optional
 2+wikimedia-apache-config-appserver_1.1_all.deb unknown optional
Index: trunk/debs/wikimedia-apache-config-appserver/debian/changelog
——@@ -1,3 +1,10 @@
 2+wikimedia-apache-config-appserver (1.2) feisty; urgency=low
 3+
 4+ * Load some required modules.
 5+ * Log to the right place (/usr/local/apache/logs)
 6+
 7+ -- River Tarnell <river@wikimedia.org> Sat, 12 May 2007 19:27:37 +0000
 8+
29 wikimedia-apache-config-appserver (1.1) feisty; urgency=low
310
411 * Include sudoers rules needed for apaches.
Index: trunk/debs/wikimedia-apache-config-appserver/nonexistent.conf
——@@ -2,7 +2,7 @@
33 <VirtualHost *>
44 DocumentRoot "/usr/local/apache/common/docroot/default"
55 ServerName nonexistent
6 - ErrorLog logs/nonexistent-error_log
7 - CustomLog logs/nonexistent-log combined
 6+ ErrorLog /usr/local/apache/logs/nonexistent-error_log
 7+ CustomLog /usr/local/apache/logs/nonexistent-log combined
88 </VirtualHost>
99
Index: trunk/debs/wikimedia-apache-config-appserver/apache2.conf
——@@ -1,4 +1,10 @@
22 LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
 3+LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
 4+LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
 5+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
 6+LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
 7+LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
 8+LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
39
410 ServerRoot "/etc/apache2"
511 #LockFile /usr/local/apache/logs/httpd.lock
Index: trunk/debs/wikimedia-apache-config-appserver/wikimedia.conf
——@@ -81,8 +81,8 @@
8282 # Waiting for Mark to write it
8383 RewriteRule ^/$ http://www.wikimedia.org/w/extract2.php?title=Www.wikimedia.org_portal&template=Www.wikimedia.org_template [L]
8484
85 - ErrorLog logs/wikimedia-error_log
86 - CustomLog logs/wikimedia-log combined
 85+ ErrorLog /usr/local/apache/logs/wikimedia-error_log
 86+ CustomLog /usr/local/apache/logs/wikimedia-log combined
8787 AddDefaultCharset Off
8888 ExpiresActive On
8989
Index: trunk/debs/wikimedia-apache-config-appserver/remnant.conf
——@@ -3,7 +3,7 @@
44 <VirtualHost *>
55 DocumentRoot "/usr/local/apache/common/docroot/meta"
66 ServerName meta.wikimedia.org
7 - ErrorLog logs/meta.wikimedia.org-error_log
 7+ ErrorLog /usr/local/apache/logs/meta.wikimedia.org-error_log
88
99 RewriteEngine On
1010
——@@ -36,7 +36,7 @@
3737 <VirtualHost *>
3838 DocumentRoot "/usr/local/apache/common/docroot/sources"
3939 ServerName wikisource.org
40 - ErrorLog logs/wikisource.org-error_log
 40+ ErrorLog /usr/local/apache/logs/wikisource.org-error_log
4141
4242 RewriteEngine On
4343
——@@ -66,7 +66,7 @@
6767 <VirtualHost *>
6868 DocumentRoot "/usr/local/apache/common/docroot/commons"
6969 ServerName commons.wikimedia.org
70 - ErrorLog logs/commons.wikimedia.org-error_log
 70+ ErrorLog /usr/local/apache/logs/commons.wikimedia.org-error_log
7171
7272 RewriteEngine On
7373
——@@ -96,7 +96,7 @@
9797 <VirtualHost *>
9898 DocumentRoot "/usr/local/apache/common/docroot/grants"
9999 ServerName grants.wikimedia.org
100 - ErrorLog logs/grants.wikimedia.org-error_log
 100+ ErrorLog /usr/local/apache/logs/grants.wikimedia.org-error_log
101101
102102 RewriteEngine On
103103
——@@ -129,7 +129,7 @@
130130 <VirtualHost *>
131131 DocumentRoot "/usr/local/apache/common/docroot/wikimania2005"
132132 ServerName wikimania2005.wikimedia.org
133 - ErrorLog logs/wikimania.wikimedia.org-error_log
 133+ ErrorLog /usr/local/apache/logs/wikimania.wikimedia.org-error_log
134134
135135 RewriteEngine On
136136
——@@ -168,7 +168,7 @@
169169 <VirtualHost *>
170170 DocumentRoot "/usr/local/apache/common/docroot/wikimania2006"
171171 ServerName wikimania2006.wikimedia.org
172 - ErrorLog logs/wikimania.wikimedia.org-error_log
 172+ ErrorLog /usr/local/apache/logs/wikimania.wikimedia.org-error_log
173173
174174 RewriteEngine On
175175
——@@ -201,7 +201,7 @@
202202 <VirtualHost *>
203203 DocumentRoot "/usr/local/apache/common/docroot/wikimania2007"
204204 ServerName wikimania2007.wikimedia.org
205 - ErrorLog logs/wikimania.wikimedia.org-error_log
 205+ ErrorLog /usr/local/apache/logs/wikimania.wikimedia.org-error_log
206206
207207 RewriteEngine On
208208
——@@ -234,7 +234,7 @@
235235 <VirtualHost *>
236236 DocumentRoot "/usr/local/apache/common/docroot/internal"
237237 ServerName internal.wikimedia.org
238 - ErrorLog logs/internal.wikimedia.org-error_log
 238+ ErrorLog /usr/local/apache/logs/internal.wikimedia.org-error_log
239239
240240 RewriteEngine On
241241
——@@ -260,7 +260,7 @@
261261 <VirtualHost *>
262262 DocumentRoot "/usr/local/apache/common/docroot/board"
263263 ServerName board.wikimedia.org
264 - ErrorLog logs/board.wikimedia.org-error_log
 264+ ErrorLog /usr/local/apache/logs/board.wikimedia.org-error_log
265265
266266 RewriteEngine On
267267
——@@ -286,7 +286,7 @@
287287 <VirtualHost *>
288288 DocumentRoot "/usr/local/apache/common/docroot/spcom"
289289 ServerName spcom.wikimedia.org
290 - ErrorLog logs/spcom.wikimedia.org-error_log
 290+ ErrorLog /usr/local/apache/logs/spcom.wikimedia.org-error_log
291291
292292 RewriteEngine On
293293
——@@ -312,7 +312,7 @@
313313 <VirtualHost *>
314314 DocumentRoot "/usr/local/apache/common/docroot/chapcom"
315315 ServerName chapcom.wikimedia.org
316 - ErrorLog logs/chapcom.wikimedia.org-error_log
 316+ ErrorLog /usr/local/apache/logs/chapcom.wikimedia.org-error_log
317317
318318 RewriteEngine On
319319
——@@ -338,7 +338,7 @@
339339 <VirtualHost *>
340340 DocumentRoot "/usr/local/apache/common/docroot/wikimaniateam"
341341 ServerName wikimaniateam.wikimedia.org
342 - ErrorLog logs/wikimaniateam.wikimedia.org-error_log
 342+ ErrorLog /usr/local/apache/logs/wikimaniateam.wikimedia.org-error_log
343343
344344 RewriteEngine On
345345
——@@ -364,7 +364,7 @@
365365 <VirtualHost *>
366366 DocumentRoot "/usr/local/apache/common/docroot/incubator"
367367 ServerName incubator.wikimedia.org
368 - ErrorLog logs/incubator.wikimedia.org-error_log
 368+ ErrorLog /usr/local/apache/logs/incubator.wikimedia.org-error_log
369369
370370 RewriteEngine On
371371
——@@ -390,7 +390,7 @@
391391 <VirtualHost *>
392392 DocumentRoot "/usr/local/apache/common/docroot/species"
393393 ServerName species.wikimedia.org
394 - ErrorLog logs/species.wikimedia.org-error_log
 394+ ErrorLog /usr/local/apache/logs/species.wikimedia.org-error_log
395395
396396 RewriteEngine On
397397
——@@ -420,7 +420,7 @@
421421 <VirtualHost *>
422422 DocumentRoot "/usr/local/apache/common/docroot/comcom"
423423 ServerName comcom.wikimedia.org
424 - ErrorLog logs/comcom.wikimedia.org-error_log
 424+ ErrorLog /usr/local/apache/logs/comcom.wikimedia.org-error_log
425425
426426 RewriteEngine On
427427
——@@ -446,7 +446,7 @@
447447 <VirtualHost *>
448448 DocumentRoot "/usr/local/apache/common/docroot/searchcom"
449449 ServerName searchcom.wikimedia.org
450 - ErrorLog logs/searchcom.wikimedia.org-error_log
 450+ ErrorLog /usr/local/apache/logs/searchcom.wikimedia.org-error_log
451451
452452 RewriteEngine On
453453
——@@ -472,7 +472,7 @@
473473 <VirtualHost *>
474474 DocumentRoot "/usr/local/apache/common/docroot/langcom"
475475 ServerName langcom.wikimedia.org
476 - ErrorLog logs/langcom.wikimedia.org-error_log
 476+ ErrorLog /usr/local/apache/logs/langcom.wikimedia.org-error_log
477477
478478 RewriteEngine On
479479
——@@ -499,7 +499,7 @@
500500 <VirtualHost *>
501501 DocumentRoot "/usr/local/apache/common/docroot/office"
502502 ServerName office.wikimedia.org
503 - ErrorLog logs/office.wikimedia.org-error_log
 503+ ErrorLog /usr/local/apache/logs/office.wikimedia.org-error_log
504504
505505 RewriteEngine On
506506
——@@ -525,7 +525,7 @@
526526 <VirtualHost *>
527527 DocumentRoot "/usr/local/apache/common/docroot/chair"
528528 ServerName chair.wikimedia.org
529 - ErrorLog logs/chair.wikimedia.org-error_log
 529+ ErrorLog /usr/local/apache/logs/chair.wikimedia.org-error_log
530530
531531 RewriteEngine On
532532
——@@ -551,7 +551,7 @@
552552 <VirtualHost *>
553553 DocumentRoot "/usr/local/apache/common/docroot/advisory"
554554 ServerName advisory.wikimedia.org
555 - ErrorLog logs/advisory.wikimedia.org-error_log
 555+ ErrorLog /usr/local/apache/logs/advisory.wikimedia.org-error_log
556556
557557 RewriteEngine On
558558
Index: trunk/debs/wikimedia-apache-config-appserver/foundation.conf
——@@ -2,8 +2,8 @@
33 DocumentRoot "/usr/local/apache/common/docroot/foundation"
44 ServerName wikimediafoundation.org
55
6 - ErrorLog logs/foundation.wikipedia-error_log
7 - CustomLog logs/foundation.wikipedia-access_log combined
 6+ ErrorLog /usr/local/apache/logs/foundation.wikipedia-error_log
 7+ CustomLog /usr/local/apache/logs/foundation.wikipedia-access_log combined
88
99 # Some additional CGI scripts
1010 # for donation tracking...
Index: trunk/debs/wikimedia-apache-config-appserver/www.wikipedia.conf
——@@ -3,8 +3,8 @@
44 DocumentRoot "/usr/local/apache/common/docroot/www.wikipedia.org"
55 ServerName www.wikipedia.org
66 ServerAlias wikipedia.org
7 - ErrorLog logs/www.wikipedia.org-error_log
8 - CustomLog logs/www.wikipedia.org-log combined
 7+ ErrorLog /usr/local/apache/logs/www.wikipedia.org-error_log
 8+ CustomLog /usr/local/apache/logs/www.wikipedia.org-log combined
99
1010 RewriteEngine On
1111