| Index: trunk/debs/wikimedia-task-appserver/envvars |
| — | — | @@ -1,16 +0,0 @@ |
| 2 | | -# Wikimedia configuration file, a hook into apache2ctl |
| 3 | | -# vim: ft=sh : |
| 4 | | - |
| 5 | | -# Set nice level |
| 6 | | -HTTPD="nice -n10 /usr/sbin/apache2 -DPHP5" |
| 7 | | - |
| 8 | | -# Image scaler detection |
| 9 | | -if [ -e /etc/wikimedia-image-scaler ]; then |
| 10 | | - HTTPD="$HTTPD -DSCALER" |
| 11 | | -fi |
| 12 | | - |
| 13 | | -# For Ubuntu 8.04+ |
| 14 | | -APACHE_HTTPD="$HTTPD" |
| 15 | | - |
| 16 | | -# Don't crash when NFS goes down |
| 17 | | -cd / |
| Index: trunk/debs/wikimedia-task-appserver/sudoers |
| — | — | @@ -1,45 +0,0 @@ |
| 2 | | -# sudoers file. |
| 3 | | -# |
| 4 | | -# ******************************************* |
| 5 | | -# WIKIMEDIA SYSTEM ADMINISTRATORS PLEASE NOTE |
| 6 | | -# ******************************************* |
| 7 | | -# Please edit /home/config/others/etc/sudoers and copy to /etc on all machines with dshroot |
| 8 | | -# |
| 9 | | -# See the sudoers man page for the details on how to write a sudoers file. |
| 10 | | -# |
| 11 | | -# vim: sts=0 noet ts=8 |
| 12 | | - |
| 13 | | -# User alias specification |
| 14 | | -User_Alias ADMINS = %wikidev |
| 15 | | -User_Alias WIKIUSER = apache,%wikidev |
| 16 | | - |
| 17 | | -# Cmnd alias specification |
| 18 | | -Cmnd_Alias ADMIN_COMMANDS = \ |
| 19 | | - /usr/sbin/apache2ctl, \ |
| 20 | | - /etc/init.d/apache2, \ |
| 21 | | - /usr/sbin/scap15-2, \ |
| 22 | | - /usr/sbin/set-group-write2, \ |
| 23 | | - /usr/sbin/install-common, \ |
| 24 | | - /usr/bin/renice, \ |
| 25 | | - /home/wikipedia/sbin/apache-kill-it, \ |
| 26 | | - /home/wikipedia/sbin/sync-common-it, \ |
| 27 | | - /home/wikipedia/sbin/sync-common-php, \ |
| 28 | | - /home/wikipedia/sbin/scap15-2, \ |
| 29 | | - /home/wikipedia/sbin/unscap-2, \ |
| 30 | | - /home/wikipedia/sbin/set-group-write2 |
| 31 | | - |
| 32 | | -# User privilege specification |
| 33 | | -root ALL=(ALL) ALL |
| 34 | | -ADMINS ALL= NOPASSWD: ADMIN_COMMANDS |
| 35 | | -WIKIUSER ALL=NOPASSWD: /home/wikipedia/sbin/wikiuser_pass_real |
| 36 | | - |
| 37 | | -# Uncomment to allow people in group wheel to run all commands |
| 38 | | -# %wheel ALL=(ALL) ALL |
| 39 | | - |
| 40 | | -# Same thing without a password |
| 41 | | -# %wheel ALL=(ALL) NOPASSWD: ALL |
| 42 | | - |
| 43 | | -# Samples |
| 44 | | -# %users ALL=/sbin/mount /cdrom,/sbin/umount /cdrom |
| 45 | | -# %users localhost=/sbin/shutdown -h now |
| 46 | | - |
| Index: trunk/debs/wikimedia-task-appserver/apache2.conf |
| — | — | @@ -1,344 +0,0 @@ |
| 2 | | -LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so |
| 3 | | -LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so |
| 4 | | -LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so |
| 5 | | -LoadModule php5_module /usr/lib/apache2/modules/libphp5.so |
| 6 | | -LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so |
| 7 | | -LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so |
| 8 | | -LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so |
| 9 | | -LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so |
| 10 | | -LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so |
| 11 | | -LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so |
| 12 | | - |
| 13 | | -ServerRoot "/etc/apache2" |
| 14 | | -#LockFile /usr/local/apache/logs/httpd.lock |
| 15 | | -PidFile /var/run/apache2.pid |
| 16 | | -LockFile /var/lock/apache2/accept.lock |
| 17 | | - |
| 18 | | -#ResourceConfig conf/srm.conf |
| 19 | | -#AccessConfig conf/access.conf |
| 20 | | -Timeout 200 |
| 21 | | - |
| 22 | | -# turned off -- brion -2004-01-09 |
| 23 | | -# on for testing -- TS 2005-11-25 |
| 24 | | -# off again, squid doesn't understand the HTTP/1.1 keepalive protocol -- TS |
| 25 | | -KeepAlive Off |
| 26 | | - |
| 27 | | -MaxKeepAliveRequests 150 |
| 28 | | -KeepAliveTimeout 2 |
| 29 | | - |
| 30 | | -MinSpareServers 5 |
| 31 | | -MaxSpareServers 20 |
| 32 | | - |
| 33 | | -StartServers 10 |
| 34 | | - |
| 35 | | -#MaxClients 24 |
| 36 | | -#MaxClients 36 |
| 37 | | -#MaxClients 50 |
| 38 | | -#MaxClients 300 |
| 39 | | -#MaxClients 255 |
| 40 | | -MaxClients 40 |
| 41 | | - |
| 42 | | -<IfDefine SLOW> |
| 43 | | -MaxClients 5 |
| 44 | | -</IfDefine> |
| 45 | | - |
| 46 | | -<IfDefine SCALER> |
| 47 | | -MaxClients 10 |
| 48 | | -# Reduce TimeOut to limit the impact of LVS flapping -- TS 2008-08-19 |
| 49 | | -TimeOut 10 |
| 50 | | -</IfDefine> |
| 51 | | - |
| 52 | | -MaxRequestsPerChild 300 |
| 53 | | - |
| 54 | | -#BindAddress * |
| 55 | | - |
| 56 | | -# Disabling to test -- 2003-11-30 BV FIXME |
| 57 | | -###LoadModule throttle_module libexec/mod_throttle.so |
| 58 | | -#AddModule mod_throttle.c |
| 59 | | - |
| 60 | | -# Disabled, don't think we use this -- TS 2004-08-01 |
| 61 | | -#LoadModule vhost_alias_module libexec/mod_vhost_alias.so |
| 62 | | - |
| 63 | | - |
| 64 | | -Listen 80 |
| 65 | | - |
| 66 | | -User apache |
| 67 | | -Group apache |
| 68 | | - |
| 69 | | -ServerAdmin brion@wikipedia.org |
| 70 | | - |
| 71 | | -ServerTokens Prod |
| 72 | | -ServerName wikimedia.org |
| 73 | | - |
| 74 | | -DocumentRoot "/usr/local/apache/common/docroot/default" |
| 75 | | - |
| 76 | | -<Directory /> |
| 77 | | - Options FollowSymLinks |
| 78 | | - AllowOverride None |
| 79 | | -</Directory> |
| 80 | | - |
| 81 | | -<Directory "/usr/local/apache/common/docroot/default"> |
| 82 | | - Options -Indexes FollowSymLinks MultiViews |
| 83 | | - AllowOverride None |
| 84 | | - |
| 85 | | - Order allow,deny |
| 86 | | - Allow from all |
| 87 | | -</Directory> |
| 88 | | - |
| 89 | | - |
| 90 | | -# Expires for static content |
| 91 | | -# sends max-age and Expires header, time in seconds |
| 92 | | -#LoadModule expires_module mod_expires.c |
| 93 | | -#<IfModule mod_expires.c> |
| 94 | | - ExpiresActive On |
| 95 | | - ExpiresByType image/gif A2592000 |
| 96 | | - ExpiresByType image/png A2592000 |
| 97 | | - ExpiresByType image/jpeg A2592000 |
| 98 | | - ExpiresByType text/css A2592000 |
| 99 | | - ExpiresByType text/javascript A2592000 |
| 100 | | - ExpiresByType application/x-javascript A2592000 |
| 101 | | -#</IfModule> |
| 102 | | - |
| 103 | | -<IfModule mod_userdir.c> |
| 104 | | - UserDir disabled |
| 105 | | -</IfModule> |
| 106 | | - |
| 107 | | -DirectoryIndex index.html |
| 108 | | - |
| 109 | | -AccessFileName .htaccess |
| 110 | | - |
| 111 | | -<Files ~ "^\.ht"> |
| 112 | | - Order allow,deny |
| 113 | | - Deny from all |
| 114 | | - Satisfy All |
| 115 | | -</Files> |
| 116 | | - |
| 117 | | -UseCanonicalName On |
| 118 | | - |
| 119 | | -TypesConfig /etc/mime.types |
| 120 | | - |
| 121 | | -DefaultType application/octet-stream |
| 122 | | - |
| 123 | | -HostnameLookups Off |
| 124 | | - |
| 125 | | -ErrorLog syslog |
| 126 | | - |
| 127 | | -#LogLevel warn |
| 128 | | -LogLevel notice |
| 129 | | - |
| 130 | | -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined |
| 131 | | -LogFormat "%h %l %u %t \"%r\" %>s %b" common |
| 132 | | -LogFormat "%{Referer}i -> %U" referer |
| 133 | | -LogFormat "%{User-agent}i" agent |
| 134 | | - |
| 135 | | -ServerSignature Off |
| 136 | | - |
| 137 | | -<IfModule mod_alias.c> |
| 138 | | - |
| 139 | | - Alias /icons/ "/usr/share/apache2/icons/" |
| 140 | | - |
| 141 | | - <Directory "/usr/share/apache2/icons/"> |
| 142 | | - Options -Indexes MultiViews |
| 143 | | - AllowOverride None |
| 144 | | - Order allow,deny |
| 145 | | - Allow from all |
| 146 | | - </Directory> |
| 147 | | - |
| 148 | | - #ScriptAlias /cgi-bin/ "/usr/local/apache/cgi-bin/" |
| 149 | | - |
| 150 | | -# <Directory "/usr/local/apache/cgi-bin"> |
| 151 | | -# AllowOverride None |
| 152 | | -# Options None |
| 153 | | -# Order allow,deny |
| 154 | | -# Allow from all |
| 155 | | -# </Directory> |
| 156 | | -</IfModule> |
| 157 | | - |
| 158 | | -#<IfModule mod_autoindex.c> |
| 159 | | - |
| 160 | | - IndexOptions FancyIndexing |
| 161 | | - |
| 162 | | - AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip |
| 163 | | - |
| 164 | | - AddIconByType (TXT,/icons/text.gif) text/* |
| 165 | | - AddIconByType (IMG,/icons/image2.gif) image/* |
| 166 | | - AddIconByType (SND,/icons/sound2.gif) audio/* |
| 167 | | - AddIconByType (VID,/icons/movie.gif) video/* |
| 168 | | - |
| 169 | | - AddIcon /icons/binary.gif .bin .exe |
| 170 | | - AddIcon /icons/binhex.gif .hqx |
| 171 | | - AddIcon /icons/tar.gif .tar |
| 172 | | - AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv |
| 173 | | - AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip |
| 174 | | - AddIcon /icons/a.gif .ps .ai .eps |
| 175 | | - AddIcon /icons/layout.gif .html .shtml .htm .pdf |
| 176 | | - AddIcon /icons/text.gif .txt |
| 177 | | - AddIcon /icons/c.gif .c |
| 178 | | - AddIcon /icons/p.gif .pl .py |
| 179 | | - AddIcon /icons/f.gif .for |
| 180 | | - AddIcon /icons/dvi.gif .dvi |
| 181 | | - AddIcon /icons/uuencoded.gif .uu |
| 182 | | - AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl |
| 183 | | - AddIcon /icons/tex.gif .tex |
| 184 | | - AddIcon /icons/bomb.gif core |
| 185 | | - |
| 186 | | - AddIcon /icons/back.gif .. |
| 187 | | - AddIcon /icons/hand.right.gif README |
| 188 | | - AddIcon /icons/folder.gif ^^DIRECTORY^^ |
| 189 | | - AddIcon /icons/blank.gif ^^BLANKICON^^ |
| 190 | | - |
| 191 | | - DefaultIcon /icons/unknown.gif |
| 192 | | - |
| 193 | | - #AddDescription "GZIP compressed document" .gz |
| 194 | | - #AddDescription "tar archive" .tar |
| 195 | | - #AddDescription "GZIP compressed tar archive" .tgz |
| 196 | | - |
| 197 | | - ReadmeName README |
| 198 | | - HeaderName HEADER |
| 199 | | - |
| 200 | | - IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t |
| 201 | | - |
| 202 | | -#</IfModule> |
| 203 | | - |
| 204 | | -#<IfModule mod_mime.c> |
| 205 | | - |
| 206 | | - AddEncoding x-compress Z |
| 207 | | - AddEncoding x-gzip gz tgz |
| 208 | | - |
| 209 | | - AddLanguage da .dk |
| 210 | | - AddLanguage nl .nl |
| 211 | | - AddLanguage en .en |
| 212 | | - AddLanguage eo .eo |
| 213 | | - AddLanguage et .ee |
| 214 | | - AddLanguage fr .fr |
| 215 | | - AddLanguage de .de |
| 216 | | - AddLanguage el .el |
| 217 | | - AddLanguage he .he |
| 218 | | - AddCharset ISO-8859-8 .iso8859-8 |
| 219 | | - AddLanguage it .it |
| 220 | | - AddLanguage ja .ja |
| 221 | | - AddCharset ISO-2022-JP .jis |
| 222 | | - AddLanguage kr .kr |
| 223 | | - AddCharset ISO-2022-KR .iso-kr |
| 224 | | - AddLanguage nn .nn |
| 225 | | - AddLanguage no .no |
| 226 | | - AddLanguage pl .po |
| 227 | | - AddCharset ISO-8859-2 .iso-pl |
| 228 | | - AddLanguage pt .pt |
| 229 | | - AddLanguage pt-br .pt-br |
| 230 | | - AddLanguage ltz .lu |
| 231 | | - AddLanguage ca .ca |
| 232 | | - AddLanguage es .es |
| 233 | | - AddLanguage sv .sv |
| 234 | | - AddLanguage cz .cz |
| 235 | | - AddLanguage ru .ru |
| 236 | | - AddLanguage zh-tw .tw |
| 237 | | - AddLanguage tw .tw |
| 238 | | - AddCharset Big5 .Big5 .big5 |
| 239 | | - AddCharset WINDOWS-1251 .cp-1251 |
| 240 | | - AddCharset CP866 .cp866 |
| 241 | | - AddCharset ISO-8859-5 .iso-ru |
| 242 | | - AddCharset KOI8-R .koi8-r |
| 243 | | - AddCharset UCS-2 .ucs2 |
| 244 | | - AddCharset UCS-4 .ucs4 |
| 245 | | - AddCharset UTF-8 .utf8 |
| 246 | | - |
| 247 | | - <IfModule mod_negotiation.c> |
| 248 | | - LanguagePriority en eo da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw |
| 249 | | - </IfModule> |
| 250 | | - |
| 251 | | - AddType application/x-tar .tgz |
| 252 | | - AddType text/xml .rdf |
| 253 | | - AddType application/x-bzip2 .bz2 |
| 254 | | - |
| 255 | | - <IfModule mod_php4.c> |
| 256 | | - AddType application/x-httpd-php .php .php4 .php3 .phtml |
| 257 | | - AddType application/x-httpd-php-source .phps |
| 258 | | - </IfModule> |
| 259 | | - <IfModule mod_php5.c> |
| 260 | | - AddType application/x-httpd-php .php .php5 .php4 .php3 .phtml |
| 261 | | - AddType application/x-httpd-php-source .phps |
| 262 | | - </IfModule> |
| 263 | | - |
| 264 | | -#</IfModule> |
| 265 | | - |
| 266 | | -#<IfModule mod_setenvif.c> |
| 267 | | - |
| 268 | | - BrowserMatch "Mozilla/2" nokeepalive |
| 269 | | - BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 |
| 270 | | - |
| 271 | | - BrowserMatch "RealPlayer 4\.0" force-response-1.0 |
| 272 | | - BrowserMatch "Java/1\.0" force-response-1.0 |
| 273 | | - BrowserMatch "JDK/1\.0" force-response-1.0 |
| 274 | | - |
| 275 | | -#</IfModule> |
| 276 | | - |
| 277 | | -#<Location /x-server-status> |
| 278 | | -# SetHandler server-status |
| 279 | | -# Order deny,allow |
| 280 | | -# Deny from all |
| 281 | | -# Allow from .wikipedia.org |
| 282 | | -## That's me -- brion |
| 283 | | -# Allow from mark.usc.edu |
| 284 | | -# Allow from 64.165.227.217 |
| 285 | | -## Jeronim |
| 286 | | -# Allow from 210.49.82.219 |
| 287 | | -#</Location> |
| 288 | | - |
| 289 | | -ErrorDocument 503 /503.html |
| 290 | | -ErrorDocument 404 /w/404.php |
| 291 | | - |
| 292 | | -NameVirtualHost * |
| 293 | | - |
| 294 | | -# Disabling to test -- 2003-11-30 BV FIXME |
| 295 | | -####Include /apache/conf/throttle.conf |
| 296 | | - |
| 297 | | -# Includes |
| 298 | | - |
| 299 | | -# Note, the order is important |
| 300 | | -# In particular, this must be the first virtual subdomain: |
| 301 | | -Include /etc/apache2/wmf/nonexistent.conf |
| 302 | | - |
| 303 | | -# www.wikipedia.org |
| 304 | | -Include /etc/apache2/wmf/www.wikipedia.conf |
| 305 | | - |
| 306 | | -# Redirects also must override *.wikipedia.org |
| 307 | | -Include /etc/apache2/wmf/redirects.conf |
| 308 | | - |
| 309 | | -# Various domains including all the multi-subdomain projects |
| 310 | | -# Also some site-wide settings |
| 311 | | -Include /etc/apache2/wmf/main.conf |
| 312 | | - |
| 313 | | -# A few single-subdomain projects |
| 314 | | -Include /etc/apache2/wmf/remnant.conf |
| 315 | | - |
| 316 | | -# Set the bad_bots environment variable based on various criteria |
| 317 | | -# Include /usr/local/apache/conf/bots.conf |
| 318 | | - |
| 319 | | -# boards.wikimedia.org |
| 320 | | -# DISABLED 2004-11-18 --brion |
| 321 | | -#Include /usr/local/apache/conf/boards.conf |
| 322 | | - |
| 323 | | -# upload.wikimedia.org |
| 324 | | -# DISABLED as this is now done on albert 2005-02-26 --brion |
| 325 | | -#Include /usr/local/apache/conf/upload.conf |
| 326 | | - |
| 327 | | -# secure.wikimedia.org unencrypted backend |
| 328 | | -Include /etc/apache2/wmf/wikimedia-ssl-backend.conf |
| 329 | | - |
| 330 | | -# *.wikimedia.org |
| 331 | | -Include /etc/apache2/wmf/wikimedia.conf |
| 332 | | - |
| 333 | | -# wikimediafoundation.org and its aliases |
| 334 | | -Include /etc/apache2/wmf/foundation.conf |
| 335 | | - |
| 336 | | -# A simple redirect to en, perhaps this once contained the load balancing redirect |
| 337 | | -Include /etc/apache2/wmf/en2.conf |
| 338 | | - |
| 339 | | -# A couple of redirects for www.XXX.wikipedia.org |
| 340 | | -Include /etc/apache2/wmf/postrewrites.conf |
| 341 | | - |
| 342 | | -# Set ETags for files to not be based on inode, |
| 343 | | -# since that will be different on each backend server |
| 344 | | -# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926 |
| 345 | | -FileETag MTime Size |
| Index: trunk/debs/wikimedia-task-appserver/php.ini |
| — | — | @@ -1,28 +0,0 @@ |
| 2 | | -; Wikimedia PHP configuration for PHP 5 Apache module in Ubuntu or FC
|
| 3 | | -
|
| 4 | | -default_socket_timeout = 1
|
| 5 | | -max_execution_time = 180
|
| 6 | | -memory_limit = 100M
|
| 7 | | -display_errors = Off
|
| 8 | | -log_errors = On
|
| 9 | | -error_log = syslog
|
| 10 | | -
|
| 11 | | -; Maximum file size (also in squid)
|
| 12 | | -post_max_size = 100M
|
| 13 | | -upload_max_filesize = 100M
|
| 14 | | -
|
| 15 | | -; Magic quotes are a tool of the devil! You know, a torture tool. That the
|
| 16 | | -; devil uses to torture programmers. Like me. I don't like that.
|
| 17 | | -magic_quotes_gpc = Off
|
| 18 | | -
|
| 19 | | -; Including both FC and Ubuntu paths here
|
| 20 | | -include_path = ".:/usr/local/lib/php:/usr/share/php:/usr/local/apache/common/php"
|
| 21 | | -
|
| 22 | | -; temporarily on while working on lucene config --brion 2005-04-16
|
| 23 | | -allow_url_fopen = On
|
| 24 | | -
|
| 25 | | -; Don't care about MySQL down too much
|
| 26 | | -mysql.connect_timeout = 1
|
| 27 | | -
|
| 28 | | -session.save_path = /tmp
|
| 29 | | -
|
| Index: trunk/debs/wikimedia-task-appserver/mw-cleanup-tmp |
| — | — | @@ -1,8 +0,0 @@ |
| 2 | | -#!/bin/bash |
| 3 | | - |
| 4 | | -/usr/bin/find /tmp -mmin +60 -a \( \ |
| 5 | | - -name EasyTimeline.txt.\* -o \ |
| 6 | | - -name \*.png -o \ |
| 7 | | - -name php\* \) \ |
| 8 | | - -delete |
| 9 | | - |
| Index: trunk/debs/wikimedia-task-appserver/debian/dirs |
| — | — | @@ -3,4 +3,3 @@ |
| 4 | 4 | usr/local/apache |
| 5 | 5 | etc/php5/apache2/ |
| 6 | 6 | usr/share/php5 |
| 7 | | -etc/cron.hourly |
| Index: trunk/debs/wikimedia-task-appserver/debian/postinst |
| — | — | @@ -18,23 +18,6 @@ |
| 19 | 19 | # the debian-policy package |
| 20 | 20 | # |
| 21 | 21 | |
| 22 | | -checkmount() { |
| 23 | | - dev=$1 |
| 24 | | - mnt=$2 |
| 25 | | - |
| 26 | | - [ -d $mnt ] || { |
| 27 | | - mkdir -p $mnt |
| 28 | | - echo "created $mnt" >&2 |
| 29 | | - } |
| 30 | | - |
| 31 | | - grep -qs "^$dev" /etc/fstab || { |
| 32 | | - echo "Adding $mnt mount..." >&2 |
| 33 | | - echo >>/etc/fstab \ |
| 34 | | - "$dev $mnt nfs bg,soft,udp,rsize=8192,wsize=8192,timeo=14,intr,nfsvers=3 0 0" |
| 35 | | - mount $mnt || true |
| 36 | | - } |
| 37 | | -} |
| 38 | | - |
| 39 | 22 | create_apache_user() { |
| 40 | 23 | # Create apache user/group with correct uid/gid |
| 41 | 24 | if ! getent group apache > /dev/null |
| — | — | @@ -74,19 +57,6 @@ |
| 75 | 58 | |
| 76 | 59 | chown -R pybal-check:pybal-check /var/lib/pybal-check/.ssh |
| 77 | 60 | |
| 78 | | - checkmount ms7.pmtpa.wmnet:/export/upload /mnt/upload6 |
| 79 | | - checkmount ms4.wikimedia.org:/export/thumbs /mnt/thumbs |
| 80 | | - |
| 81 | | - CLUSTER=$(cat /etc/wikimedia-cluster) |
| 82 | | - if [ $CLUSTER="pmtpa" ] |
| 83 | | - then |
| 84 | | - rsync -a 10.0.5.8::httpdconf/ /usr/local/apache/conf |
| 85 | | - |
| 86 | | - sync-common |
| 87 | | - /etc/init.d/apache2 start || true |
| 88 | | - else |
| 89 | | - echo "remember to sync this server before you start it!" |
| 90 | | - fi |
| 91 | 61 | ;; |
| 92 | 62 | |
| 93 | 63 | abort-upgrade|abort-remove|abort-deconfigure) |
| Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -17,16 +17,6 @@ |
| 18 | 18 | # for details, see http://www.debian.org/doc/debian-policy/ or |
| 19 | 19 | # the debian-policy package |
| 20 | 20 | |
| 21 | | -removemount() { |
| 22 | | - mnt=$1 |
| 23 | | - grep -qs "$mnt.*nfs" /etc/fstab && { |
| 24 | | - echo "Removing $mnt from fstab" |
| 25 | | - sed -i "\\,$mnt,d" /etc/fstab |
| 26 | | - } |
| 27 | | - |
| 28 | | - umount $mnt || true |
| 29 | | -} |
| 30 | | - |
| 31 | 21 | case "$1" in |
| 32 | 22 | purge) |
| 33 | 23 | # Remove apache user |
| — | — | @@ -36,29 +26,11 @@ |
| 37 | 27 | # Remove PyBal check user account |
| 38 | 28 | deluser pybal-check |
| 39 | 29 | rm -rf /var/lib/pybal-check |
| 40 | | - |
| 41 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
| 42 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
| 43 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /usr/share/php5/php.ini-dist |
| 44 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/sudoers |
| 45 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
| 46 | 30 | ;; |
| 47 | 31 | remove) |
| 48 | | - removemount /mnt/upload3 |
| 49 | | - removemount /mnt/upload4 |
| 50 | | - removemount /mnt/upload5 |
| 51 | | - remotemount /mnt/upload6 |
| 52 | | - removemount /mnt/math |
| 53 | | - removemount /mnt/thumbs |
| 54 | 32 | ;; |
| 55 | 33 | |
| 56 | 34 | upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
| 57 | | - removemount /mnt/upload3 |
| 58 | | - removemount /mnt/upload4 |
| 59 | | - removemount /mnt/upload5 |
| 60 | | - removemount /mnt/upload6 |
| 61 | | - removemount /mnt/math |
| 62 | | - removemount /mnt/thumbs |
| 63 | 35 | ;; |
| 64 | 36 | |
| 65 | 37 | *) |
| Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -16,18 +16,6 @@ |
| 17 | 17 | |
| 18 | 18 | case "$1" in |
| 19 | 19 | install) |
| 20 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 21 | | - --divert /etc/apache2/apache2.conf.default /etc/apache2/apache2.conf |
| 22 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 23 | | - --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 24 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 25 | | - --divert /usr/share/php5/php.ini-dist.default /usr/share/php5/php.ini-dist |
| 26 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 27 | | - --divert /etc/sudoers.default /etc/sudoers |
| 28 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 29 | | - --divert /etc/apache2/envvars.default /etc/apache2/envvars |
| 30 | | - |
| 31 | | - |
| 32 | 20 | # Create user for the PyBal checks |
| 33 | 21 | adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check |
| 34 | 22 | ;; |
| Index: trunk/debs/wikimedia-task-appserver/debian/prerm |
| — | — | @@ -35,8 +35,6 @@ |
| 36 | 36 | uname -snrvm > /var/run/motd |
| 37 | 37 | cat /etc/motd.tail >> /var/run/motd |
| 38 | 38 | fi |
| 39 | | - |
| 40 | | - [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 stop |
| 41 | 39 | ;; |
| 42 | 40 | |
| 43 | 41 | upgrade) |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +wikimedia-task-appserver (1.46) hardy; urgency=low |
| | 3 | + |
| | 4 | + * Removed all configuration out of this package, into Puppet |
| | 5 | + |
| | 6 | + -- Mark Bergsma <mark@wikimedia.org> Fri, 05 Nov 2010 14:21:05 +0000 |
| | 7 | + |
| 2 | 8 | wikimedia-task-appserver (1.45) hardy; urgency=low |
| 3 | 9 | |
| 4 | 10 | * Try to start apache but don't break if it doesn't work. |
| Index: trunk/debs/wikimedia-task-appserver/debian/conffiles |
| — | — | @@ -1,5 +0,0 @@ |
| 2 | | -/etc/apache2/apache2.conf |
| 3 | | -/etc/php5/apache2/php.ini |
| 4 | | -/etc/sudoers |
| 5 | | -/etc/apache2/envvars |
| 6 | | -/etc/cron.hourly/mw-cleanup-tmp |
| Index: trunk/debs/wikimedia-task-appserver/debian/rules |
| — | — | @@ -48,13 +48,6 @@ |
| 49 | 49 | dh_installdirs |
| 50 | 50 | dh_link |
| 51 | 51 | |
| 52 | | - install -m 0644 apache2.conf $(DESTDIR)/etc/apache2 |
| 53 | | - install -m 0644 envvars $(DESTDIR)/etc/apache2 |
| 54 | | - install -m 0644 php.ini $(DESTDIR)/etc/php5/apache2 |
| 55 | | - install -m 0644 php.ini $(DESTDIR)/usr/share/php5/php.ini-dist |
| 56 | | - install -m 0400 sudoers $(DESTDIR)/etc/ |
| 57 | | - install -m 0755 mw-cleanup-tmp $(DESTDIR)/etc/cron.hourly/ |
| 58 | | - |
| 59 | 52 | # Install sync/check scripts |
| 60 | 53 | install -d -m 0755 $(DESTDIR)/usr/bin |
| 61 | 54 | install -d -m 0755 $(DESTDIR)/usr/sbin |