[MediaWiki-commits] [Gerrit] Updated config files accordingly with the previous commit - change (mediawiki...MediaWikiFarm)

[Seb35 (Code Review)]

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/299372

Change subject: Updated config files accordingly with the previous commit
......................................................................

Updated config files accordingly with the previous commit
---
M config/farms.php
M config/farms.yml
2 files changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/72/299372/1

diff --git a/config/farms.php b/config/farms.php
index e7ff326..b0bfc49 100644
--- a/config/farms.php
+++ b/config/farms.php
@@ -15,7 +15,7 @@
                ),
                'suffix' => '$family',
                'wikiID' => '$lang$family',
-               'versions' => 'wikiversions.yml',
+               'versions' => 'wikiversions.json',
                'data' => '/srv/data/org/$family/$lang',
                'cache' => '/tmp/mw-cache/org-$version-$family-$lang',
                'config' => array(
@@ -32,7 +32,6 @@
                        
                        array( 'variable' => 'client',
                               'file'     => 'com/example/clients.yml',
-                              'config'   => 
'com/example/$client/InitialiseSettings.yml',
                        ),
                        array( 'variable' => 'wiki',
                               'file'     => 'com/example/$client/wikis.yml',
@@ -42,8 +41,8 @@
                '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(
+               'config' => array(
+                       'com/example/InitialiseSettings.yml',
                        'com/example/PrivateSettings.yml',
                        'com/example/GlobalSettings.yml',
                ),
diff --git a/config/farms.yml b/config/farms.yml
index e53442c..f621328 100644
--- a/config/farms.yml
+++ b/config/farms.yml
@@ -10,7 +10,7 @@
     
     suffix: '$family'
     wikiID: '$lang$family'
-    versions: 'wikiversions.yml'
+    versions: 'wikiversions.json'
     data: '/srv/data/org/$family/$lang'
     cache: '/tmp/mw-cache/org-$version-$family-$lang'
     config:
@@ -25,7 +25,6 @@
         
         - variable: 'client'
           file: 'com/example/clients.yml'
-          config: 'com/example/$client/InitialiseSettings.yml'
         
         - variable: 'wiki'
           file: 'com/example/$client/wikis.yml'
@@ -34,8 +33,8 @@
     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:
+    config:
+      - 'com/example/InitialiseSettings.yml'
       - 'com/example/PrivateSettings.yml'
       - 'com/example/GlobalSettings.yml'
     exec-config: 'com/example/ExecSettings.php'

-- 
To view, visit https://gerrit.wikimedia.org/r/299372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d4a6bd75c7a1dd1be64a83b64a55664283acdc2
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