Seb35 has uploaded a new change for review. https://gerrit.wikimedia.org/r/299400
Change subject: First pass on standardisation of directories (multiversion): the MediaWikiFarm extension must be installed next to MediaWiki versions and inside each MediaWiki version ...................................................................... First pass on standardisation of directories (multiversion): the MediaWikiFarm extension must be installed next to MediaWiki versions and inside each MediaWiki version Defined a LocalSettings.php for multiversion, a simple inclusion of the version-specific MediaWikiFarm extension --- A docs/config/LocalSettings.multiversion.php M docs/config/LocalSettings.php M src/MediaWikiFarm.php M src/api.php.txt M src/img_auth.php.txt M src/index.php.txt M src/load.php.txt M src/main.php M src/opensearch_desc.php.txt 9 files changed, 28 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm refs/changes/00/299400/1 diff --git a/docs/config/LocalSettings.multiversion.php b/docs/config/LocalSettings.multiversion.php new file mode 100644 index 0000000..04fba54 --- /dev/null +++ b/docs/config/LocalSettings.multiversion.php @@ -0,0 +1,13 @@ +<?php + +/** + * Configuration managed by MediaWikiFarm -- MultiVersion case. + * + * Note the MediaWikiFarm extension must be installed in each version. + */ + +# Include the code. +require_once "$IP/extensions/MediaWikiFarm/MediaWikiFarm.php"; + +# Do not add other configuration here, but instead in the config files +# read by MediaWikiFarm -- even for global settings. diff --git a/docs/config/LocalSettings.php b/docs/config/LocalSettings.php index 5681f46..d2432a0 100644 --- a/docs/config/LocalSettings.php +++ b/docs/config/LocalSettings.php @@ -1,7 +1,7 @@ <?php /** - * Configuration managed by MediaWikiFarm. + * Configuration managed by MediaWikiFarm -- MonoVersion case. * * Just change the configuration directory, preferably in a directory not exposed on the Web. * Then add the sample file farms.yml inside and start customising it. diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php index b43fa0f..fcd82cb 100644 --- a/src/MediaWikiFarm.php +++ b/src/MediaWikiFarm.php @@ -10,6 +10,10 @@ # Protect against web entry if( !defined( 'MEDIAWIKI' ) && !defined( 'MEDIAWIKI_FARM' ) ) exit; +# Protect against double inclusion +# This could happen even with require_once in the case of multiversion installation +if( defined( 'MEDIAWIKI_FARM' ) ) return; + /** * This class computes the configuration of a specific wiki from a set of configuration files. * The configuration is composed of the list of authorised wikis and different configuration diff --git a/src/api.php.txt b/src/api.php.txt index 9030be6..fcf25c3 100644 --- a/src/api.php.txt +++ b/src/api.php.txt @@ -11,12 +11,12 @@ define( 'MEDIAWIKI_FARM', true ); # Configuration of the MediaWiki Farm -$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); +$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( __FILE__ ) ) ); $wgMediaWikiFarmConfigDir = dirname( $wgMediaWikiFarmCodeDir ) . '/config'; # Include library // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound -require_once dirname( __FILE__ ) . '/../src/MediaWikiFarm.php'; +require_once dirname( dirname( __FILE__ ) ) . '/src/MediaWikiFarm.php'; // @codingStandardsIgnoreEnd # Redirect to the requested version diff --git a/src/img_auth.php.txt b/src/img_auth.php.txt index 29fd198..8cdd43d 100644 --- a/src/img_auth.php.txt +++ b/src/img_auth.php.txt @@ -11,12 +11,12 @@ define( 'MEDIAWIKI_FARM', true ); # Configuration of the MediaWiki Farm -$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); +$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( __FILE__ ) ) ); $wgMediaWikiFarmConfigDir = dirname( $wgMediaWikiFarmCodeDir ) . '/config'; # Include library // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound -require_once dirname( __FILE__ ) . '/../src/MediaWikiFarm.php'; +require_once dirname( dirname( __FILE__ ) ) . '/src/MediaWikiFarm.php'; // @codingStandardsIgnoreEnd # Redirect to the requested version diff --git a/src/index.php.txt b/src/index.php.txt index 56d2f6d..75dce6c 100644 --- a/src/index.php.txt +++ b/src/index.php.txt @@ -11,12 +11,12 @@ define( 'MEDIAWIKI_FARM', true ); # Configuration of the MediaWiki Farm -$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); +$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( __FILE__ ) ) ); $wgMediaWikiFarmConfigDir = dirname( $wgMediaWikiFarmCodeDir ) . '/config'; # Include library // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound -require_once dirname( __FILE__ ) . '/../src/MediaWikiFarm.php'; +require_once dirname( dirname( __FILE__ ) ) . '/src/MediaWikiFarm.php'; // @codingStandardsIgnoreEnd # Redirect to the requested version diff --git a/src/load.php.txt b/src/load.php.txt index dbf078d..e0adbc6 100644 --- a/src/load.php.txt +++ b/src/load.php.txt @@ -11,12 +11,12 @@ define( 'MEDIAWIKI_FARM', true ); # Configuration of the MediaWiki Farm -$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); +$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( __FILE__ ) ) ); $wgMediaWikiFarmConfigDir = dirname( $wgMediaWikiFarmCodeDir ) . '/config'; # Include library // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound -require_once dirname( __FILE__ ) . '/../src/MediaWikiFarm.php'; +require_once dirname( dirname( __FILE__ ) ) . '/src/MediaWikiFarm.php'; // @codingStandardsIgnoreEnd # Redirect to the requested version diff --git a/src/main.php b/src/main.php index f3a7904..222c1f8 100644 --- a/src/main.php +++ b/src/main.php @@ -10,9 +10,6 @@ # Protect against web entry if( !defined( 'MEDIAWIKI' ) ) exit; -# Definition of a constant to protect dedicated entry points -define( 'MEDIAWIKI_FARM', true ); - require_once __DIR__ . '/MediaWikiFarm.php'; $wgMediaWikiFarm = MediaWikiFarm::initialise( $GLOBALS['_SERVER']['HTTP_HOST'] ); diff --git a/src/opensearch_desc.php.txt b/src/opensearch_desc.php.txt index 671a76b..87d862c 100644 --- a/src/opensearch_desc.php.txt +++ b/src/opensearch_desc.php.txt @@ -11,12 +11,12 @@ define( 'MEDIAWIKI_FARM', true ); # Configuration of the MediaWiki Farm -$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); +$wgMediaWikiFarmCodeDir = dirname( dirname( dirname( __FILE__ ) ) ); $wgMediaWikiFarmConfigDir = dirname( $wgMediaWikiFarmCodeDir ) . '/config'; # Include library // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound -require_once dirname( __FILE__ ) . '/../src/MediaWikiFarm.php'; +require_once dirname( dirname( __FILE__ ) ) . '/src/MediaWikiFarm.php'; // @codingStandardsIgnoreEnd # Redirect to the requested version -- To view, visit https://gerrit.wikimedia.org/r/299400 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25f16007c56b314f2be197d3cc8f5d5b7088ee1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiFarm Gerrit-Branch: master Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
