Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299368
Change subject: Update config files
......................................................................
Update config files
Already used in my dev environment (adapted)
---
M config/farms.php
M config/farms.yml
2 files changed, 20 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/68/299368/1
diff --git a/config/farms.php b/config/farms.php
index cf4db0c..4a196fc 100644
--- a/config/farms.php
+++ b/config/farms.php
@@ -8,18 +8,21 @@
'variables' => array(
array( 'variable' => 'family',
- 'file' => '$family.dblist',
),
array( 'variable' => 'lang',
+ 'file' => 'org/$family.dblist',
'type' => 'language',
),
),
+ 'suffix' => '$family',
+ 'wikiID' => '$lang$family',
'data' => '/srv/data/org/$family/$lang',
'cache' => '/tmp/mw-cache/org-$version-$family-$lang',
'config' => array(
'org/InitialiseSettings.php',
'org/PrivateSettings.php',
),
+ 'exec-config' => 'org/ExecSettings.php',
),
# Configuration for a small wiki farm
@@ -28,19 +31,22 @@
'variables' => array(
array( 'variable' => 'client',
- 'file' => 'clients.yml',
+ 'file' => 'com/example/clients.yml',
'config' =>
'com/example/$client/InitialiseSettings.yml',
),
array( 'variable' => 'wiki',
- 'file' => '$client/wikis.yml',
+ 'file' => 'com/example/$client/wikis.yml',
),
),
+ 'suffix' => '$family',
+ 'wikiID' => '$wiki-$client',
'data' => '/srv/data/com/example/$client/$wiki',
'cache' => '/tmp/mw-cache/com-example-$version-$client-$wiki',
'config' => 'com/example/InitialiseSettings.yml',
'post-config' => array(
'com/example/PrivateSettings.yml',
- 'com/example/GlobalSettings.php',
+ 'com/example/GlobalSettings.yml',
),
+ 'exec-config' => 'com/example/ExecSettings.php',
),
);
diff --git a/config/farms.yml b/config/farms.yml
index 99cfe9b..6e733b9 100644
--- a/config/farms.yml
+++ b/config/farms.yml
@@ -4,16 +4,19 @@
variables:
- variable: 'family'
- file: '$family.dblist'
- variable: 'lang'
+ file: 'org/$family.dblist'
type: 'language'
+ suffix: '$family'
+ wikiID: '$lang$family'
data: '/srv/data/org/$family/$lang'
cache: '/tmp/mw-cache/org-$version-$family-$lang'
config:
- 'org/InitialiseSettings.php'
- 'org/PrivateSettings.php'
+ exec-config: 'org/ExecSettings.php'
# Configuration for a small wiki farm
'(?<client>[a-z]+)-(?<wiki>[a-z]+)\.example\.com':
@@ -21,15 +24,18 @@
variables:
- variable: 'client'
- file: 'clients.yml'
+ file: 'com/example/clients.yml'
config: 'com/example/$client/InitialiseSettings.yml'
- variable: 'wiki'
- file: '$client/wikis.yml'
+ file: 'com/example/$client/wikis.yml'
+ suffix: '$client'
+ wikiID: '$wiki-$client'
data: '/srv/data/com/example/$client/$wiki'
cache: '/tmp/mw-cache/com-example-$version-$client-$wiki'
config: 'com/example/InitialiseSettings.yml'
post-config:
- 'com/example/PrivateSettings.yml'
- - 'com/example/GlobalSettings.php'
+ - 'com/example/GlobalSettings.yml'
+ exec-config: 'com/example/ExecSettings.php'
--
To view, visit https://gerrit.wikimedia.org/r/299368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic15fb8e0a8400e8f237868fc8063d7a8c04be732
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
