Ori.livneh has submitted this change and it was merged.
Change subject: remove unused files in files/apache
......................................................................
remove unused files in files/apache
Change-Id: I78f9fdf7a7e2205d502d9bbf5820710748a9a4f4
---
D files/apache/apache2.conf.api_appserver
D files/apache/apache2.conf.appserver
D files/apache/envvars.appserver
D files/apache/rewrite.conf
4 files changed, 0 insertions(+), 744 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, approved
diff --git a/files/apache/apache2.conf.api_appserver
b/files/apache/apache2.conf.api_appserver
deleted file mode 100644
index bb5073d..0000000
--- a/files/apache/apache2.conf.api_appserver
+++ /dev/null
@@ -1,370 +0,0 @@
-# This file is managed by Puppet!
-
-LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so
-LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
-LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so
-LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
-LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
-LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-LoadModule status_module /usr/lib/apache2/modules/mod_status.so
-
-ServerRoot "/etc/apache2"
-#LockFile /usr/local/apache/logs/httpd.lock
-PidFile /var/run/apache2.pid
-LockFile /var/lock/apache2/accept.lock
-
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
-Timeout 200
-
-# turned off -- brion -2004-01-09
-# on for testing -- TS 2005-11-25
-# off again, squid doesn't understand the HTTP/1.1 keepalive protocol -- TS
-# on again for testing -- mark 2012-02-10
-KeepAlive on
-
-MaxKeepAliveRequests 150
-KeepAliveTimeout 2
-
-MinSpareServers 5
-MaxSpareServers 20
-
-StartServers 10
-
-#MaxClients 24
-#MaxClients 36
-#MaxClients 50
-#MaxClients 300
-#MaxClients 255
-MaxClients 100
-
-<IfDefine SLOW>
-MaxClients 5
-</IfDefine>
-
-<IfDefine SCALER>
-MaxClients 10
-# Reduce TimeOut to limit the impact of LVS flapping -- TS 2008-08-19
-TimeOut 10
-</IfDefine>
-
-MaxRequestsPerChild 300
-
-#BindAddress *
-
-# Disabling to test -- 2003-11-30 BV FIXME
-###LoadModule throttle_module libexec/mod_throttle.so
-#AddModule mod_throttle.c
-
-# Disabled, don't think we use this -- TS 2004-08-01
-#LoadModule vhost_alias_module libexec/mod_vhost_alias.so
-
-
-Listen 80
-
-User apache
-Group apache
-
-ServerAdmin r...@wikimedia.org
-
-ServerTokens Prod
-ServerName wikimedia.org
-
-DocumentRoot "/usr/local/apache/common/docroot/default"
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
-</Directory>
-
-<Directory "/usr/local/apache/common/docroot/default">
- Options -Indexes FollowSymLinks MultiViews
- AllowOverride None
-
- Order allow,deny
- Allow from all
-</Directory>
-
-
-# Expires and CORS for static content
-# sends max-age and Expires header, time in seconds
-#LoadModule expires_module mod_expires.c
-#<IfModule mod_expires.c>
- ExpiresActive On
- <Directory "/usr/local/apache/common/docroot">
- <FilesMatch "\.(gif|jpe?g|png|css|js|json|woff|svg|eot|ttf)$">
- ExpiresByType image/gif A2592000
- ExpiresByType image/png A2592000
- ExpiresByType image/jpeg A2592000
- ExpiresByType text/css A2592000
- ExpiresByType text/javascript A2592000
- ExpiresByType application/x-javascript A2592000
- ExpiresByType application/json A2592000
- ExpiresByType application/x-font-woff A2592000
- ExpiresByType image/svg+xml A2592000
- ExpiresByType application/vnd.ms-fontobject A2592000
- ExpiresByType application/x-font-ttf A2592000
- Header add Access-Control-Allow-Origin "*"
- </FilesMatch>
- </Directory>
-#</IfModule>
-
-<IfModule mod_userdir.c>
- UserDir disabled
-</IfModule>
-
-DirectoryIndex index.html
-
-AccessFileName .htaccess
-
-<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-# RT 1666: prevent downloading of .*~ and similar files
-<FilesMatch "(\.bak|\.old|~|#)$">
- Order allow,deny
- Deny from all
- Satisfy All
-</FilesMatch>
-
-UseCanonicalName On
-
-TypesConfig /etc/mime.types
-
-DefaultType application/octet-stream
-
-HostnameLookups Off
-
-ErrorLog syslog
-
-#LogLevel warn
-LogLevel notice
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature Off
-
-<IfModule mod_alias.c>
-
- Alias /icons/ "/usr/share/apache2/icons/"
-
- <Directory "/usr/share/apache2/icons/">
- Options -Indexes MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
- #ScriptAlias /cgi-bin/ "/usr/local/apache/cgi-bin/"
-
-# <Directory "/usr/local/apache/cgi-bin">
-# AllowOverride None
-# Options None
-# Order allow,deny
-# Allow from all
-# </Directory>
-</IfModule>
-
-#<IfModule mod_autoindex.c>
-
- IndexOptions FancyIndexing
-
- AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
- AddIconByType (TXT,/icons/text.gif) text/*
- AddIconByType (IMG,/icons/image2.gif) image/*
- AddIconByType (SND,/icons/sound2.gif) audio/*
- AddIconByType (VID,/icons/movie.gif) video/*
-
- AddIcon /icons/binary.gif .bin .exe
- AddIcon /icons/binhex.gif .hqx
- AddIcon /icons/tar.gif .tar
- AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
- AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
- AddIcon /icons/a.gif .ps .ai .eps
- AddIcon /icons/layout.gif .html .shtml .htm .pdf
- AddIcon /icons/text.gif .txt
- AddIcon /icons/c.gif .c
- AddIcon /icons/p.gif .pl .py
- AddIcon /icons/f.gif .for
- AddIcon /icons/dvi.gif .dvi
- AddIcon /icons/uuencoded.gif .uu
- AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
- AddIcon /icons/tex.gif .tex
- AddIcon /icons/bomb.gif core
-
- AddIcon /icons/back.gif ..
- AddIcon /icons/hand.right.gif README
- AddIcon /icons/folder.gif ^^DIRECTORY^^
- AddIcon /icons/blank.gif ^^BLANKICON^^
-
- DefaultIcon /icons/unknown.gif
-
- #AddDescription "GZIP compressed document" .gz
- #AddDescription "tar archive" .tar
- #AddDescription "GZIP compressed tar archive" .tgz
-
- ReadmeName README
- HeaderName HEADER
-
- IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-
-#</IfModule>
-
-#<IfModule mod_mime.c>
-
- AddEncoding x-compress Z
- AddEncoding x-gzip gz tgz
-
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage eo .eo
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cz .cz
- AddLanguage ru .ru
- AddLanguage zh-tw .tw
- AddLanguage tw .tw
- AddCharset Big5 .Big5 .big5
- AddCharset WINDOWS-1251 .cp-1251
- AddCharset CP866 .cp866
- AddCharset ISO-8859-5 .iso-ru
- AddCharset KOI8-R .koi8-r
- AddCharset UCS-2 .ucs2
- AddCharset UCS-4 .ucs4
- AddCharset UTF-8 .utf8
-
- <IfModule mod_negotiation.c>
- LanguagePriority en eo da nl et fr de el it ja kr no pl pt pt-br ru
ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
- AddType text/xml .rdf
- AddType application/x-bzip2 .bz2
- AddType application/x-woff .woff
- AddType application/vnd.ms-fontobject .eot
- # TTF doesn't have an official MIME type, but I really don't want to use
application/octet-stream for it
- AddType application/x-font-ttf .ttf
-
- <IfModule mod_php4.c>
- AddType application/x-httpd-php .php .php4 .php3 .phtml
- AddType application/x-httpd-php-source .phps
- </IfModule>
- <IfModule mod_php5.c>
- AddType application/x-httpd-php .php .php5 .php4 .php3 .phtml
- AddType application/x-httpd-php-source .phps
- </IfModule>
-
-#</IfModule>
-
-#<IfModule mod_setenvif.c>
-
- BrowserMatch "Mozilla/2" nokeepalive
- BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-
- BrowserMatch "RealPlayer 4\.0" force-response-1.0
- BrowserMatch "Java/1\.0" force-response-1.0
- BrowserMatch "JDK/1\.0" force-response-1.0
-
-#</IfModule>
-
-ExtendedStatus On
-<Location /server-status>
- SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
-## That's me -- brion
-# Allow from mark.usc.edu
-# Allow from 64.165.227.217
-## Jeronim
-# Allow from 210.49.82.219
-</Location>
-
-ErrorDocument 503 /503.html
-ErrorDocument 404 /w/404.php
-
-NameVirtualHost *
-
-# Disabling to test -- 2003-11-30 BV FIXME
-####Include /apache/conf/throttle.conf
-
-# Includes
-
-# Note, the order is important
-# In particular, this must be the first virtual subdomain:
-Include /etc/apache2/wmf/nonexistent.conf
-
-# www.wikipedia.org
-Include /etc/apache2/wmf/www.wikipedia.conf
-
-# Redirects also must override *.wikipedia.org
-Include /etc/apache2/wmf/redirects.conf
-
-# Various domains including all the multi-subdomain projects
-# Also some site-wide settings
-Include /etc/apache2/wmf/main.conf
-
-# A few single-subdomain projects
-Include /etc/apache2/wmf/remnant.conf
-
-# Set the bad_bots environment variable based on various criteria
-# Include /usr/local/apache/conf/bots.conf
-
-# boards.wikimedia.org
-# DISABLED 2004-11-18 --brion
-#Include /usr/local/apache/conf/boards.conf
-
-# upload.wikimedia.org
-# DISABLED as this is now done on albert 2005-02-26 --brion
-#Include /usr/local/apache/conf/upload.conf
-
-# secure.wikimedia.org unencrypted backend
-Include /etc/apache2/wmf/wikimedia-ssl-backend.conf
-
-# *.wikimedia.org
-Include /etc/apache2/wmf/wikimedia.conf
-
-# wikimediafoundation.org and its aliases
-Include /etc/apache2/wmf/foundation.conf
-
-# A simple redirect to en, perhaps this once contained the load balancing
redirect
-Include /etc/apache2/wmf/en2.conf
-
-# A couple of redirects for www.XXX.wikipedia.org
-Include /etc/apache2/wmf/postrewrites.conf
-
-# Set ETags for files to not be based on inode,
-# since that will be different on each backend server
-# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926
-FileETag MTime Size
diff --git a/files/apache/apache2.conf.appserver
b/files/apache/apache2.conf.appserver
deleted file mode 100644
index eff18df..0000000
--- a/files/apache/apache2.conf.appserver
+++ /dev/null
@@ -1,338 +0,0 @@
-# This file is managed by Puppet!
-
-LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so
-LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
-LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so
-LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
-LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
-LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-LoadModule status_module /usr/lib/apache2/modules/mod_status.so
-
-ServerRoot "/etc/apache2"
-#LockFile /usr/local/apache/logs/httpd.lock
-PidFile /var/run/apache2.pid
-LockFile /var/lock/apache2/accept.lock
-
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
-Timeout 200
-
-# turned off -- brion -2004-01-09
-# on for testing -- TS 2005-11-25
-# off again, squid doesn't understand the HTTP/1.1 keepalive protocol -- TS
-# on again for testing -- mark 2012-02-10
-KeepAlive on
-
-MaxKeepAliveRequests 150
-KeepAliveTimeout 2
-
-MinSpareServers 5
-MaxSpareServers 20
-
-StartServers 10
-
-#MaxClients 24
-#MaxClients 36
-#MaxClients 50
-#MaxClients 300
-#MaxClients 255
-#MaxClients 40
-MaxClients 50
-
-
-<IfDefine SLOW>
-MaxClients 5
-</IfDefine>
-
-<IfDefine SCALER>
-MaxClients 18
-# Reduce TimeOut to limit the impact of LVS flapping -- TS 2008-08-19
-TimeOut 10
-</IfDefine>
-
-MaxRequestsPerChild 300
-
-#BindAddress *
-
-# Disabling to test -- 2003-11-30 BV FIXME
-###LoadModule throttle_module libexec/mod_throttle.so
-#AddModule mod_throttle.c
-
-# Disabled, don't think we use this -- TS 2004-08-01
-#LoadModule vhost_alias_module libexec/mod_vhost_alias.so
-
-
-# Thanks to an envvars hack, you can enable core dumps with:
-#
-# echo 500000 > /etc/apache2/core-dump-max-size
-#
-# Then restart apache
-#
-<IfDefine CORE_DUMPS>
- CoreDumpDirectory /usr/local/apache/core
-</IfDefine>
-
-Listen 80
-
-User apache
-Group apache
-
-ServerAdmin r...@wikimedia.org
-
-ServerTokens Prod
-ServerName wikimedia.org
-
-DocumentRoot "/usr/local/apache/common/docroot/default"
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
-</Directory>
-
-<Directory "/usr/local/apache/common/docroot/default">
- Options -Indexes FollowSymLinks MultiViews
- AllowOverride None
-
- Order allow,deny
- Allow from all
-</Directory>
-
-
-# Expires and CORS for static content
-# sends max-age and Expires header, time in seconds
-#LoadModule expires_module mod_expires.c
-#<IfModule mod_expires.c>
- ExpiresActive On
- <Directory "/usr/local/apache/common/docroot">
- <FilesMatch "\.(gif|jpe?g|png|css|js|json|woff|svg|eot|ttf)$">
- ExpiresByType image/gif A2592000
- ExpiresByType image/png A2592000
- ExpiresByType image/jpeg A2592000
- ExpiresByType text/css A2592000
- ExpiresByType text/javascript A2592000
- ExpiresByType application/x-javascript A2592000
- ExpiresByType application/json A2592000
- ExpiresByType application/x-font-woff A2592000
- ExpiresByType image/svg+xml A2592000
- ExpiresByType application/vnd.ms-fontobject A2592000
- ExpiresByType application/x-font-ttf A2592000
- Header add Access-Control-Allow-Origin "*"
- </FilesMatch>
- </Directory>
-#</IfModule>
-
-<IfModule mod_userdir.c>
- UserDir disabled
-</IfModule>
-
-DirectoryIndex index.html
-
-AccessFileName .htaccess
-
-<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-# RT 1666: prevent downloading of .*~ and similar files
-<FilesMatch "(\.bak|\.old|~|#)$">
- Order allow,deny
- Deny from all
- Satisfy All
-</FilesMatch>
-
-UseCanonicalName On
-
-TypesConfig /etc/mime.types
-
-DefaultType application/octet-stream
-
-HostnameLookups Off
-
-ErrorLog syslog
-
-#LogLevel warn
-LogLevel notice
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature Off
-
-<IfModule mod_alias.c>
-
- Alias /icons/ "/usr/share/apache2/icons/"
-
- <Directory "/usr/share/apache2/icons/">
- Options -Indexes MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
- #ScriptAlias /cgi-bin/ "/usr/local/apache/cgi-bin/"
-
-# <Directory "/usr/local/apache/cgi-bin">
-# AllowOverride None
-# Options None
-# Order allow,deny
-# Allow from all
-# </Directory>
-</IfModule>
-
-#<IfModule mod_autoindex.c>
-
- IndexOptions FancyIndexing
-
- AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
- AddIconByType (TXT,/icons/text.gif) text/*
- AddIconByType (IMG,/icons/image2.gif) image/*
- AddIconByType (SND,/icons/sound2.gif) audio/*
- AddIconByType (VID,/icons/movie.gif) video/*
-
- AddIcon /icons/binary.gif .bin .exe
- AddIcon /icons/binhex.gif .hqx
- AddIcon /icons/tar.gif .tar
- AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
- AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
- AddIcon /icons/a.gif .ps .ai .eps
- AddIcon /icons/layout.gif .html .shtml .htm .pdf
- AddIcon /icons/text.gif .txt
- AddIcon /icons/c.gif .c
- AddIcon /icons/p.gif .pl .py
- AddIcon /icons/f.gif .for
- AddIcon /icons/dvi.gif .dvi
- AddIcon /icons/uuencoded.gif .uu
- AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
- AddIcon /icons/tex.gif .tex
- AddIcon /icons/bomb.gif core
-
- AddIcon /icons/back.gif ..
- AddIcon /icons/hand.right.gif README
- AddIcon /icons/folder.gif ^^DIRECTORY^^
- AddIcon /icons/blank.gif ^^BLANKICON^^
-
- DefaultIcon /icons/unknown.gif
-
- #AddDescription "GZIP compressed document" .gz
- #AddDescription "tar archive" .tar
- #AddDescription "GZIP compressed tar archive" .tgz
-
- ReadmeName README
- HeaderName HEADER
-
- IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-
-#</IfModule>
-
-#<IfModule mod_mime.c>
-
- AddEncoding x-compress Z
- AddEncoding x-gzip gz tgz
-
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage eo .eo
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cz .cz
- AddLanguage ru .ru
- AddLanguage zh-tw .tw
- AddLanguage tw .tw
- AddCharset Big5 .Big5 .big5
- AddCharset WINDOWS-1251 .cp-1251
- AddCharset CP866 .cp866
- AddCharset ISO-8859-5 .iso-ru
- AddCharset KOI8-R .koi8-r
- AddCharset UCS-2 .ucs2
- AddCharset UCS-4 .ucs4
- AddCharset UTF-8 .utf8
-
- <IfModule mod_negotiation.c>
- LanguagePriority en eo da nl et fr de el it ja kr no pl pt pt-br ru
ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
- AddType text/xml .rdf
- AddType application/x-bzip2 .bz2
- AddType application/x-font-woff .woff
- AddType application/vnd.ms-fontobject .eot
- # TTF doesn't have an official MIME type, but I really don't want to use
application/octet-stream for it
- AddType application/x-font-ttf .ttf
- #add webm, lucid does not have this by default
- AddType video/webm .webm
-
- <IfModule mod_php4.c>
- AddType application/x-httpd-php .php .php4 .php3 .phtml
- AddType application/x-httpd-php-source .phps
- </IfModule>
- <IfModule mod_php5.c>
- AddType application/x-httpd-php .php .php5 .php4 .php3 .phtml
- AddType application/x-httpd-php-source .phps
- </IfModule>
-
-#</IfModule>
-
-#<IfModule mod_setenvif.c>
-
- BrowserMatch "Mozilla/2" nokeepalive
- BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-
- BrowserMatch "RealPlayer 4\.0" force-response-1.0
- BrowserMatch "Java/1\.0" force-response-1.0
- BrowserMatch "JDK/1\.0" force-response-1.0
-
-#</IfModule>
-
-ExtendedStatus On
-<Location /server-status>
- SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
-## That's me -- brion
-# Allow from mark.usc.edu
-# Allow from 64.165.227.217
-## Jeronim
-# Allow from 210.49.82.219
-</Location>
-
-ErrorDocument 503 /503.html
-ErrorDocument 404 /w/404.php
-
-NameVirtualHost *
-
-Include /etc/apache2/wmf/all.conf
-
-# Set ETags for files to not be based on inode,
-# since that will be different on each backend server
-# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926
-FileETag MTime Size
diff --git a/files/apache/envvars.appserver b/files/apache/envvars.appserver
deleted file mode 100644
index 63f662e..0000000
--- a/files/apache/envvars.appserver
+++ /dev/null
@@ -1,26 +0,0 @@
-# Wikimedia configuration file, a hook into apache2ctl
-# This file is managed by Puppet!
-# vim: ft=sh :
-
-NICE=$((-`nice`))
-HTTPD="nice -n$NICE /usr/sbin/apache2 -DPHP5"
-
-# Image scaler detection
-if [ -e /etc/wikimedia-image-scaler ]; then
- HTTPD="$HTTPD -DSCALER"
-fi
-
-# Core dump support
-if [ -e /etc/apache2/core-dump-max-size ]; then
- ulimit -c "`cat /etc/apache2/core-dump-max-size`"
- HTTPD="$HTTPD -DCORE_DUMPS"
- mkdir -p /usr/local/apache/core
- chown apache:apache /usr/local/apache/core
- chmod 700 /usr/local/apache/core
-fi
-
-# For Ubuntu 10.04+
-APACHE_PID_FILE="/var/run/apache2.pid"
-
-# Don't crash when NFS goes down
-cd /
diff --git a/files/apache/rewrite.conf b/files/apache/rewrite.conf
deleted file mode 100644
index 69e5254..0000000
--- a/files/apache/rewrite.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/rewrite.conf
-#####################################################################
-# vim: filetype=apache
-
-RewriteEngine On
-RewriteCond %{REQUEST_URI} !^/w.*/
-RewriteRule ^(.*) /wiki/index.php/$1 [L]
-
--
To view, visit https://gerrit.wikimedia.org/r/137883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78f9fdf7a7e2205d502d9bbf5820710748a9a4f4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
