Skip to content
Snippets Groups Projects
Verified Commit 1a573ba9 authored by Kristian Klausen's avatar Kristian Klausen :tada:
Browse files

Merge branch 'archwiki-1.38' into 'master'

archwiki: upgrade to 1.38.1-1

See merge request !598
parents 4c2e1abf e637829b
No related branches found
No related tags found
1 merge request!598archwiki: upgrade to 1.38.1-1
Pipeline #22055 passed
...@@ -3,7 +3,7 @@ archwiki_domain: 'wiki.archlinux.org' ...@@ -3,7 +3,7 @@ archwiki_domain: 'wiki.archlinux.org'
archwiki_nginx_conf: '/etc/nginx/nginx.d/archwiki.conf' archwiki_nginx_conf: '/etc/nginx/nginx.d/archwiki.conf'
archwiki_user: 'archwiki' archwiki_user: 'archwiki'
archwiki_repository: 'https://github.com/archlinux/archwiki.git' archwiki_repository: 'https://github.com/archlinux/archwiki.git'
archwiki_version: '1.37.2-2' archwiki_version: '1.38.1-1'
archwiki_question_answer_file: '/srv/http/archwiki/registration-question-answer.txt' archwiki_question_answer_file: '/srv/http/archwiki/registration-question-answer.txt'
archwiki_socket: '/run/php-fpm/archwiki.socket' archwiki_socket: '/run/php-fpm/archwiki.socket'
......
...@@ -48,7 +48,6 @@ $wgScriptPath = ""; ...@@ -48,7 +48,6 @@ $wgScriptPath = "";
$wgArticlePath = "/title/$1"; $wgArticlePath = "/title/$1";
# $wgUsePathInfo is not necessary: https://github.com/wikimedia/mediawiki/blob/bb92c4d1acc029eed0f6848360dff5b2436695fc/includes/WebRequest.php#L151-L153 # $wgUsePathInfo is not necessary: https://github.com/wikimedia/mediawiki/blob/bb92c4d1acc029eed0f6848360dff5b2436695fc/includes/WebRequest.php#L151-L153
#$wgUsePathInfo = true; #$wgUsePathInfo = true;
$wgScriptExtension = ".php";
## The relative URL path to the skins directory ## The relative URL path to the skins directory
$wgStylePath = "$wgScriptPath/skins"; $wgStylePath = "$wgScriptPath/skins";
...@@ -81,9 +80,6 @@ $wgRunJobsAsync = 1; ...@@ -81,9 +80,6 @@ $wgRunJobsAsync = 1;
$wgAllowUserJs = true; $wgAllowUserJs = true;
$wgAllowUserCss = true; $wgAllowUserCss = true;
# Section anchors: use HTML5-style anchors as primary, legacy as fallbback
$wgFragmentMode = [ 'html5', 'legacy' ];
## ##
## Database settings ## Database settings
...@@ -101,9 +97,6 @@ $wgDBprefix = ""; ...@@ -101,9 +97,6 @@ $wgDBprefix = "";
# MySQL table options to use during installation or update # MySQL table options to use during installation or update
$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary"; $wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
# Experimental charset support for MySQL 5.0.
$wgDBmysql5 = false;
## ##
## Email settings ## Email settings
...@@ -148,12 +141,10 @@ $wgMemCachedServers = [ "unix://{{ archwiki_memcached_socket }}" ]; ...@@ -148,12 +141,10 @@ $wgMemCachedServers = [ "unix://{{ archwiki_memcached_socket }}" ];
## to make your wiki go slightly faster. The directory should not ## to make your wiki go slightly faster. The directory should not
## be publically accessible from the web. ## be publically accessible from the web.
$wgCacheDirectory = "$IP/../cache/data"; $wgCacheDirectory = "$IP/../cache/data";
$wgShowIPinHeader = false;
$wgEnableSidebarCache = true; $wgEnableSidebarCache = true;
$wgUseFileCache = true; $wgUseFileCache = true;
$wgFileCacheDirectory = "$IP/../cache/html"; $wgFileCacheDirectory = "$IP/../cache/html";
$wgUseGzip = true; $wgUseGzip = true;
$wgUseETag = true;
# CSS-based preferences supposedly cause about 20 times slower page loads # CSS-based preferences supposedly cause about 20 times slower page loads
# https://phabricator.wikimedia.org/rSVN63707 # https://phabricator.wikimedia.org/rSVN63707
...@@ -184,11 +175,6 @@ $wgEnableUploads = true; ...@@ -184,11 +175,6 @@ $wgEnableUploads = true;
# InstantCommons allows wiki to use images from http://commons.wikimedia.org # InstantCommons allows wiki to use images from http://commons.wikimedia.org
$wgUseInstantCommons = false; $wgUseInstantCommons = false;
## If you use ImageMagick (or any other shell command) on a
## Linux server, this will need to be set to the name of an
## available UTF-8 locale
$wgShellLocale = "en_US.utf8";
## If you want to use image uploads under safe mode, ## If you want to use image uploads under safe mode,
## create the directories images/archive, images/thumb and ## create the directories images/archive, images/thumb and
## images/temp, and make them all writable. Then uncomment ## images/temp, and make them all writable. Then uncomment
...@@ -205,11 +191,8 @@ $wgShellLocale = "en_US.utf8"; ...@@ -205,11 +191,8 @@ $wgShellLocale = "en_US.utf8";
wfLoadSkin( 'MonoBook' ); wfLoadSkin( 'MonoBook' );
wfLoadSkin( 'Vector' ); wfLoadSkin( 'Vector' );
$wgVectorResponsive = true; $wgVectorResponsive = true;
$wgVectorDefaultSkinVersion = '2';
$wgVectorDefaultSkinVersionForNewAccounts = '2';
wfLoadExtension( 'ArchLinux' ); wfLoadExtension( 'ArchLinux' );
$wgDefaultSkin = 'vector'; $wgDefaultSkin = 'vector-2022';
$wgDefaultUserOptions['skin'] = 'vector';
$wgArchHome = 'https://www.archlinux.org/'; $wgArchHome = 'https://www.archlinux.org/';
$wgArchNavBar = array( $wgArchNavBar = array(
'Home' => 'https://www.archlinux.org/', 'Home' => 'https://www.archlinux.org/',
...@@ -293,7 +276,6 @@ $wgGroupPermissions['sysop']['editprotected2'] = true; ...@@ -293,7 +276,6 @@ $wgGroupPermissions['sysop']['editprotected2'] = true;
$wgGroupPermissions['cosysop']['editprotected2'] = true; $wgGroupPermissions['cosysop']['editprotected2'] = true;
$wgGroupPermissions['privileged']['editprotected2'] = true; $wgGroupPermissions['privileged']['editprotected2'] = true;
$wgEnableWriteAPI = true;
# disable user account creation via API # disable user account creation via API
$wgAPIModules['createaccount'] = 'ApiDisabled'; $wgAPIModules['createaccount'] = 'ApiDisabled';
# remove 'writeapi' right from users # remove 'writeapi' right from users
...@@ -459,5 +441,4 @@ wfLoadExtension( 'CodeEditor' ); ...@@ -459,5 +441,4 @@ wfLoadExtension( 'CodeEditor' );
# temporary disable registration; reverted 2016-6-26 bluewind # temporary disable registration; reverted 2016-6-26 bluewind
#$wgGroupPermissions['*']['createaccount'] = false; #$wgGroupPermissions['*']['createaccount'] = false;
# $wgShowSQLErrors = true;
# $wgReadOnly = 'Database migration in progress. We`ll be back in a few minutes.'; # $wgReadOnly = 'Database migration in progress. We`ll be back in a few minutes.';
...@@ -75,16 +75,6 @@ server { ...@@ -75,16 +75,6 @@ server {
rewrite ^ /rest.php; rewrite ^ /rest.php;
} }
# https://phabricator.wikimedia.org/T288686
location ^~ /w/rest.php/v1/search/title {
return 302 /rest.php/v1/search/title$is_args$args;
}
# Workaround for "Search for pages containing" hard-coded to /w/index.php
location ^~ /w/index.php {
return 302 /index.php$is_args$args;
}
# special case for '/load.php' type URLs to cache css/js in nginx to relieve php-fpm # special case for '/load.php' type URLs to cache css/js in nginx to relieve php-fpm
location = /load.php { location = /load.php {
access_log /var/log/nginx/{{ archwiki_domain }}/access.log main; access_log /var/log/nginx/{{ archwiki_domain }}/access.log main;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment