r25012 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r25011‎ | r25012 | r25013 >
Date:21:27, 21 August 2007
Author:tstarling
Status:old
Tags:
Comment:
* Added apache2.conf and symlink to the apache conf files in the legacy location.
* Removed /usr/local/apache/logs directory, no longer needed
* Switched to dh_link instead of ln -s, and dh_installdirs instead of install -d.
Modified paths:
  • /trunk/debs/wikimedia-task-appserver/apache2.conf (added) (history)
  • /trunk/debs/wikimedia-task-appserver/apache2.conf (added) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/changelog (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/conffiles (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/dirs (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/links (added) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/rules (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/debian/links
——@@ -0,0 +1,5 @@
 2+usr/local/apache apache
 3+usr/local/apache/common-local usr/local/apache/common
 4+home/wikipedia/common usr/local/apache/common-shared
 5+home/wikipedia/htdocs usr/local/apache/htdocs
 6+usr/local/apache/conf etc/apache2/wmf
Index: trunk/debs/wikimedia-task-appserver/debian/dirs
——@@ -0,0 +1,3 @@
 2+etc
 3+etc/apache2
 4+usr/local/apache
Index: trunk/debs/wikimedia-task-appserver/debian/changelog
——@@ -1,3 +1,13 @@
 2+wikimedia-task-appserver (1.7) feisty; urgency=low
 3+
 4+ * Added apache2.conf and symlink to the apache conf files in the legacy
 5+ location.
 6+ * Removed /usr/local/apache/logs directory, no longer needed
 7+ * Switched to dh_link instead of ln -s, and dh_installdirs instead of
 8+ install -d.
 9+
 10+ -- Tim Starling <tstarling@wikimedia.org> Tue, 21 Aug 2007 21:14:35 +0000
 11+
212 wikimedia-task-appserver (1.6) feisty; urgency=low
313
414 * Brion added depends php5-apc, php5-wikidiff2, php5-fss
Index: trunk/debs/wikimedia-task-appserver/debian/conffiles
——@@ -0,0 +1 @@
 2+/etc/apache2/apache2.conf
Index: trunk/debs/wikimedia-task-appserver/debian/rules
——@@ -46,16 +46,11 @@
4747 dh_testroot
4848 dh_clean -k
4949 dh_installdirs
 50+ dh_link
 51+
 52+ install -m 0644 apache2.conf $(DESTDIR)/etc/apache2
 53+ install -m 0644 sudoers $(DESTDIR)/etc/
5054
51 - install -d $(DESTDIR)/usr/local/apache
52 - install -d $(DESTDIR)/usr/local/apache/logs
53 - ln -s /usr/local/apache $(DESTDIR)/
54 - ln -s common-local $(DESTDIR)/usr/local/apache/common
55 - ln -s /home/wikipedia/common $(DESTDIR)/usr/local/apache/common-shared
56 - ln -s /home/wikipedia/htdocs $(DESTDIR)/usr/local/apache
57 - install -d $(DESTDIR)/etc
58 - install sudoers $(DESTDIR)/etc/
59 -
6055 # Build architecture-independent files here.
6156 binary-indep: build install
6257 # We have nothing to do by default.
Index: trunk/debs/wikimedia-task-appserver/apache2.conf
——@@ -0,0 +1,342 @@
 2+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
 9+
 10+ServerRoot "/etc/apache2"
 11+#LockFile /usr/local/apache/logs/httpd.lock
 12+PidFile /var/run/apache2.pid
 13+LockFile /var/lock/apache2/accept.lock
 14+
 15+#ResourceConfig conf/srm.conf
 16+#AccessConfig conf/access.conf
 17+Timeout 200
 18+
 19+# turned off -- brion -2004-01-09
 20+# on for testing -- TS 2005-11-25
 21+# off again, squid doesn't understand the HTTP/1.1 keepalive protocol -- TS
 22+KeepAlive Off
 23+
 24+MaxKeepAliveRequests 150
 25+KeepAliveTimeout 2
 26+
 27+MinSpareServers 5
 28+MaxSpareServers 20
 29+
 30+StartServers 10
 31+
 32+#MaxClients 24
 33+#MaxClients 36
 34+#MaxClients 50
 35+#MaxClients 300
 36+#MaxClients 255
 37+MaxClients 40
 38+
 39+<IfDefine SLOW>
 40+MaxClients 5
 41+</IfDefine>
 42+
 43+#MaxClients 20
 44+
 45+MaxRequestsPerChild 300
 46+
 47+#BindAddress *
 48+
 49+# Disabling to test -- 2003-11-30 BV FIXME
 50+###LoadModule throttle_module libexec/mod_throttle.so
 51+#AddModule mod_throttle.c
 52+
 53+# Disabled, don't think we use this -- TS 2004-08-01
 54+#LoadModule vhost_alias_module libexec/mod_vhost_alias.so
 55+
 56+
 57+Listen 80
 58+
 59+User apache
 60+Group apache
 61+
 62+ServerAdmin brion@wikipedia.org
 63+
 64+ServerTokens Prod
 65+ServerName wikimedia.org
 66+
 67+DocumentRoot "/usr/local/apache/common/docroot/default"
 68+
 69+<Directory />
 70+ Options FollowSymLinks
 71+ AllowOverride None
 72+</Directory>
 73+
 74+<Directory "/usr/local/apache/common/docroot/default">
 75+ Options -Indexes FollowSymLinks MultiViews
 76+ AllowOverride None
 77+
 78+ Order allow,deny
 79+ Allow from all
 80+</Directory>
 81+
 82+
 83+# Expires for static content
 84+# sends max-age and Expires header, time in seconds
 85+#LoadModule expires_module mod_expires.c
 86+#<IfModule mod_expires.c>
 87+ ExpiresActive On
 88+ ExpiresByType image/gif A2592000
 89+ ExpiresByType image/png A2592000
 90+ ExpiresByType image/jpeg A2592000
 91+ ExpiresByType text/css A2592000
 92+ ExpiresByType text/javascript A2592000
 93+ ExpiresByType application/x-javascript A2592000
 94+#</IfModule>
 95+
 96+<IfModule mod_userdir.c>
 97+ UserDir disabled
 98+</IfModule>
 99+
 100+<IfModule mod_dir.c>
 101+ DirectoryIndex index.html
 102+</IfModule>
 103+
 104+AccessFileName .htaccess
 105+
 106+<Files ~ "^\.ht">
 107+ Order allow,deny
 108+ Deny from all
 109+ Satisfy All
 110+</Files>
 111+
 112+UseCanonicalName On
 113+
 114+<IfModule mod_mime.c>
 115+ TypesConfig /etc/mime.types
 116+</IfModule>
 117+
 118+DefaultType application/octet-stream
 119+
 120+HostnameLookups Off
 121+
 122+ErrorLog syslog
 123+
 124+#LogLevel warn
 125+LogLevel notice
 126+
 127+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 128+LogFormat "%h %l %u %t \"%r\" %>s %b" common
 129+LogFormat "%{Referer}i -> %U" referer
 130+LogFormat "%{User-agent}i" agent
 131+
 132+ServerSignature Off
 133+
 134+<IfModule mod_alias.c>
 135+
 136+ Alias /icons/ "/usr/share/apache2/icons/"
 137+
 138+ <Directory "/usr/share/apache2/icons/">
 139+ Options -Indexes MultiViews
 140+ AllowOverride None
 141+ Order allow,deny
 142+ Allow from all
 143+ </Directory>
 144+
 145+ #ScriptAlias /cgi-bin/ "/usr/local/apache/cgi-bin/"
 146+
 147+# <Directory "/usr/local/apache/cgi-bin">
 148+# AllowOverride None
 149+# Options None
 150+# Order allow,deny
 151+# Allow from all
 152+# </Directory>
 153+</IfModule>
 154+
 155+<IfModule mod_autoindex.c>
 156+
 157+ IndexOptions FancyIndexing
 158+
 159+ AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
 160+
 161+ AddIconByType (TXT,/icons/text.gif) text/*
 162+ AddIconByType (IMG,/icons/image2.gif) image/*
 163+ AddIconByType (SND,/icons/sound2.gif) audio/*
 164+ AddIconByType (VID,/icons/movie.gif) video/*
 165+
 166+ AddIcon /icons/binary.gif .bin .exe
 167+ AddIcon /icons/binhex.gif .hqx
 168+ AddIcon /icons/tar.gif .tar
 169+ AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
 170+ AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
 171+ AddIcon /icons/a.gif .ps .ai .eps
 172+ AddIcon /icons/layout.gif .html .shtml .htm .pdf
 173+ AddIcon /icons/text.gif .txt
 174+ AddIcon /icons/c.gif .c
 175+ AddIcon /icons/p.gif .pl .py
 176+ AddIcon /icons/f.gif .for
 177+ AddIcon /icons/dvi.gif .dvi
 178+ AddIcon /icons/uuencoded.gif .uu
 179+ AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
 180+ AddIcon /icons/tex.gif .tex
 181+ AddIcon /icons/bomb.gif core
 182+
 183+ AddIcon /icons/back.gif ..
 184+ AddIcon /icons/hand.right.gif README
 185+ AddIcon /icons/folder.gif ^^DIRECTORY^^
 186+ AddIcon /icons/blank.gif ^^BLANKICON^^
 187+
 188+ DefaultIcon /icons/unknown.gif
 189+
 190+ #AddDescription "GZIP compressed document" .gz
 191+ #AddDescription "tar archive" .tar
 192+ #AddDescription "GZIP compressed tar archive" .tgz
 193+
 194+ ReadmeName README
 195+ HeaderName HEADER
 196+
 197+ IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 198+
 199+</IfModule>
 200+
 201+<IfModule mod_mime.c>
 202+
 203+ AddEncoding x-compress Z
 204+ AddEncoding x-gzip gz tgz
 205+
 206+ AddLanguage da .dk
 207+ AddLanguage nl .nl
 208+ AddLanguage en .en
 209+ AddLanguage eo .eo
 210+ AddLanguage et .ee
 211+ AddLanguage fr .fr
 212+ AddLanguage de .de
 213+ AddLanguage el .el
 214+ AddLanguage he .he
 215+ AddCharset ISO-8859-8 .iso8859-8
 216+ AddLanguage it .it
 217+ AddLanguage ja .ja
 218+ AddCharset ISO-2022-JP .jis
 219+ AddLanguage kr .kr
 220+ AddCharset ISO-2022-KR .iso-kr
 221+ AddLanguage nn .nn
 222+ AddLanguage no .no
 223+ AddLanguage pl .po
 224+ AddCharset ISO-8859-2 .iso-pl
 225+ AddLanguage pt .pt
 226+ AddLanguage pt-br .pt-br
 227+ AddLanguage ltz .lu
 228+ AddLanguage ca .ca
 229+ AddLanguage es .es
 230+ AddLanguage sv .sv
 231+ AddLanguage cz .cz
 232+ AddLanguage ru .ru
 233+ AddLanguage zh-tw .tw
 234+ AddLanguage tw .tw
 235+ AddCharset Big5 .Big5 .big5
 236+ AddCharset WINDOWS-1251 .cp-1251
 237+ AddCharset CP866 .cp866
 238+ AddCharset ISO-8859-5 .iso-ru
 239+ AddCharset KOI8-R .koi8-r
 240+ AddCharset UCS-2 .ucs2
 241+ AddCharset UCS-4 .ucs4
 242+ AddCharset UTF-8 .utf8
 243+
 244+ <IfModule mod_negotiation.c>
 245+ LanguagePriority en eo da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
 246+ </IfModule>
 247+
 248+ AddType application/x-tar .tgz
 249+ AddType text/xml .rdf
 250+ AddType application/x-bzip2 .bz2
 251+
 252+ <IfModule mod_php4.c>
 253+ AddType application/x-httpd-php .php .php4 .php3 .phtml
 254+ AddType application/x-httpd-php-source .phps
 255+ </IfModule>
 256+ <IfModule mod_php5.c>
 257+ AddType application/x-httpd-php .php .php5 .php4 .php3 .phtml
 258+ AddType application/x-httpd-php-source .phps
 259+ </IfModule>
 260+
 261+</IfModule>
 262+
 263+<IfModule mod_setenvif.c>
 264+
 265+ BrowserMatch "Mozilla/2" nokeepalive
 266+ BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
 267+
 268+ BrowserMatch "RealPlayer 4\.0" force-response-1.0
 269+ BrowserMatch "Java/1\.0" force-response-1.0
 270+ BrowserMatch "JDK/1\.0" force-response-1.0
 271+
 272+</IfModule>
 273+
 274+<Location /x-server-status>
 275+ SetHandler server-status
 276+ Order deny,allow
 277+ Deny from all
 278+ Allow from .wikipedia.org
 279+# That's me -- brion
 280+ Allow from mark.usc.edu
 281+ Allow from 64.165.227.217
 282+# Jeronim
 283+ Allow from 210.49.82.219
 284+Allow from all
 285+</Location>
 286+
 287+ErrorDocument 503 /503.html
 288+ErrorDocument 404 /w/404.php
 289+
 290+NameVirtualHost *
 291+
 292+# Disabling to test -- 2003-11-30 BV FIXME
 293+####Include /apache/conf/throttle.conf
 294+
 295+# Includes
 296+
 297+# Note, the order is important
 298+# In particular, this must be the first virtual subdomain:
 299+Include /etc/apache2/wmf/nonexistent.conf
 300+
 301+# www.wikipedia.org
 302+Include /etc/apache2/wmf/www.wikipedia.conf
 303+
 304+# Redirects also must override *.wikipedia.org
 305+Include /etc/apache2/wmf/redirects.conf
 306+
 307+# Various domains including all the multi-subdomain projects
 308+# Also some site-wide settings
 309+Include /etc/apache2/wmf/main.conf
 310+
 311+# A few single-subdomain projects
 312+Include /etc/apache2/wmf/remnant.conf
 313+
 314+# Set the bad_bots environment variable based on various criteria
 315+# Include /usr/local/apache/conf/bots.conf
 316+
 317+# boards.wikimedia.org
 318+# DISABLED 2004-11-18 --brion
 319+#Include /usr/local/apache/conf/boards.conf
 320+
 321+# upload.wikimedia.org
 322+# DISABLED as this is now done on albert 2005-02-26 --brion
 323+#Include /usr/local/apache/conf/upload.conf
 324+
 325+# secure.wikimedia.org unencrypted backend
 326+Include /etc/apache2/wmf/wikimedia-ssl-backend.conf
 327+
 328+# *.wikimedia.org
 329+Include /etc/apache2/wmf/wikimedia.conf
 330+
 331+# wikimediafoundation.org and its aliases
 332+Include /etc/apache2/wmf/foundation.conf
 333+
 334+# A simple redirect to en, perhaps this once contained the load balancing redirect
 335+Include /etc/apache2/wmf/en2.conf
 336+
 337+# A couple of redirects for www.XXX.wikipedia.org
 338+Include /etc/apache2/wmf/postrewrites.conf
 339+
 340+# Set ETags for files to not be based on inode,
 341+# since that will be different on each backend server
 342+# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926
 343+FileETag MTime Size

Status & tagging log