Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

mediawiki: Fix up mediawiki for new version

Browse source 
Move IP setting to apache
Load modules the new one for ones that support it.
Undefine db prefix that was confusing mysql

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-06-19 19:45:48 +00:00
parent 3a60f8c94a
commit eb31a3ae0a
2 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

40
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -9,19 +9,6 @@
#error_reporting(1); #error_reporting(1);
#session_start(); #session_start();
# If you customize your file layout, set $IP to the directory that contains
# the other MediaWiki files. It will be used as a base to locate files.
if( defined( 'MW_INSTALL_PATH' ) ) {
$IP = MW_INSTALL_PATH;
} else {
$IP = dirname( __FILE__ );
}
#$IP = '/usr/share/mediawiki';
$path = array( $IP, "$IP/includes", "$IP/languages" );
set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
# Added for timeout testing # Added for timeout testing
require_once( "includes/DefaultSettings.php" ); require_once( "includes/DefaultSettings.php" );
#$wgDebugLogFile = '/tmp/out.log'; #$wgDebugLogFile = '/tmp/out.log';
@ -152,7 +139,7 @@ $wgDBprefix = "en_";
$wgDBTableOptions = "TYPE=InnoDB"; $wgDBTableOptions = "TYPE=InnoDB";
# Schemas for Postgres # Schemas for Postgres
$wgDBmwschema = "mediawiki"; #$wgDBmwschema = "mediawiki";
$wgDBts2schema = "public"; $wgDBts2schema = "public";
# Experimental charset support for MySQL 4.1/5.0. # Experimental charset support for MySQL 4.1/5.0.
@ -317,29 +304,20 @@ $wgNamespacesToBeSearchedDefault = array(
NS_TEST_RESULTS => true, NS_TEST_RESULTS => true,
NS_TEST_RESULTS_TALK => false NS_TEST_RESULTS_TALK => false
); );
require_once "$IP/extensions/OpenID/OpenID.setup.php";
#require_once "$IP/extensions/OpenID/OpenID.setup.php";
#require 'extensions/StubManager/StubManager.php'; #require 'extensions/StubManager/StubManager.php';
#require 'extensions/HNP/HNP.php'; #require 'extensions/HNP/HNP.php';
require_once "$IP/extensions/ParserFunctions/ParserFunctions.php"; #require_once "$IP/extensions/ParserFunctions/ParserFunctions.php";
require_once "$IP/extensions/Interwiki/Interwiki.php"; #require_once "$IP/extensions/Interwiki/Interwiki.php";
require_once "$IP/extensions/Cite/Cite.php"; #require_once "$IP/extensions/Cite/Cite.php";
require_once "$IP/extensions/fedmsg-emit.php"; require_once "$IP/extensions/fedmsg-emit.php";
require_once "$IP/extensions/HTTP302Found/HTTP302Found.php"; require_once "$IP/extensions/HTTP302Found/HTTP302Found.php";
require_once "$IP/extensions/RSS/RSS.php"; require_once "$IP/extensions/RSS/RSS.php";
require_once "$IP/extensions/BassetSubmitter.php"; #require_once "$IP/extensions/BassetSubmitter.php";
require_once "$IP/extensions/FedoraDocsRedirect/FedoraDocsRedirect.php"; require_once "$IP/extensions/FedoraDocsRedirect/FedoraDocsRedirect.php";
wfLoadExtension( 'ParserFunctions' );
{% if env == "staging" %} wfLoadExtension( 'Interwiki' );
$basset_url = 'http://basset01.stg.phx2.fedoraproject.org/basset'; wfLoadExtension( 'Cite' );
$basset_username = '{{ basset_stg_frontend_user }}';
$basset_password = '{{ basset_stg_frontend_pass }}';
{% else %}
$basset_url = 'http://basset01.phx2.fedoraproject.org/basset';
$basset_username = '{{ basset_prod_frontend_user }}';
$basset_password = '{{ basset_prod_frontend_pass }}';
{% endif %}
$wgShowExceptionDetails = true; $wgShowExceptionDetails = true;

2
roles/mediawiki/templates/mediawiki-app.conf.j2
View file

@ -5,6 +5,7 @@ Alias /{{ wpath }} /srv/web/{{ wikiname }}-wiki
Alias /{{ wikipath }} /srv/web/{{ wikiname }}-wiki/index.php Alias /{{ wikipath }} /srv/web/{{ wikiname }}-wiki/index.php
<Directory /srv/web/{{ wikiname }}-wiki> <Directory /srv/web/{{ wikiname }}-wiki>
SetEnv MW_INSTALL_PATH /srv/web/{{ wikiname }}-wiki
Options SymLinksIfOwnerMatch Options SymLinksIfOwnerMatch
AllowOverride None AllowOverride None
<IfModule mod_authz_core.c> <IfModule mod_authz_core.c>
@ -19,6 +20,7 @@ Alias /{{ wikipath }} /srv/web/{{ wikiname }}-wiki/index.php
</Directory> </Directory>
<Directory /mnt/web/attachments> <Directory /mnt/web/attachments>
SetEnv MW_INSTALL_PATH /srv/web/{{ wikiname }}
Options SymLinksIfOwnerMatch Options SymLinksIfOwnerMatch
AllowOverride None AllowOverride None
Require all granted Require all granted