[MediaWiki-commits] [Gerrit] Revert "Get rid of MULTIVER_CDB_DIR_{APACHE, HOME}" - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Revert "Get rid of MULTIVER_CDB_DIR_{APACHE,HOME}"
......................................................................

Revert "Get rid of MULTIVER_CDB_DIR_{APACHE,HOME}"

This reverts commit 8a57da1daed903be65c876fc44bc27933a2e5c98.

Change-Id: I48f4cdad5b32a0dba1b57b4ab326ec8e00e36b6c
---
M multiversion/MWMultiVersion.php
M multiversion/activeMWVersions.php
M multiversion/defines.php
M multiversion/getMWVersion.php
M multiversion/refreshWikiversionsCDB
M multiversion/updateWikiversions.php
6 files changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/03/159803/1

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 0894e09..4976fd5 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -276,7 +276,7 @@
                $this->versionLoaded = true;
 
                $cdbFilename = getRealmSpecificFilename(
-                       MULTIVER_COMMON_APACHE . '/wikiversions.cdb'
+                       MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
                );
 
                try {
@@ -302,7 +302,7 @@
         */
        private function assertNotMissing() {
                $cdbFilename = getRealmSpecificFilename(
-                       MULTIVER_COMMON_APACHE . '/wikiversions.cdb'
+                       MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
                );
                if ( $this->isMissing() ) {
                        self::error( "$cdbFilename has no version entry for 
`{$this->db}`.\n" );
diff --git a/multiversion/activeMWVersions.php 
b/multiversion/activeMWVersions.php
index 74547d7..0dc1860 100644
--- a/multiversion/activeMWVersions.php
+++ b/multiversion/activeMWVersions.php
@@ -22,9 +22,9 @@
        array_shift( $options ); // first item is this file
 
        if ( in_array( '--home', $options ) ) {
-               $jsonPath = getRealmSpecificFilename( MULTIVER_COMMON_HOME . 
'/wikiversions.json' );
+               $jsonPath = getRealmSpecificFilename( MULTIVER_CDB_DIR_HOME . 
'/wikiversions.json' );
        } else {
-               $jsonPath = getRealmSpecificFilename( MULTIVER_COMMON_APACHE . 
'/wikiversions.json' );
+               $jsonPath = getRealmSpecificFilename( MULTIVER_CDB_DIR_APACHE . 
'/wikiversions.json' );
        }
 
        # Get all the wikiversion rows in wikiversions.json...
diff --git a/multiversion/defines.php b/multiversion/defines.php
index 0460e79..cef5adc 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -5,5 +5,8 @@
 define( 'MULTIVER_COMMON_HOME', '/a/common' );
 define( 'MULTIVER_COMMON_APACHE', '/srv/mediawiki' );
 
+define( 'MULTIVER_CDB_DIR_HOME', '/a/common' );
+define( 'MULTIVER_CDB_DIR_APACHE', '/srv/mediawiki' );
+
 define( 'MULTIVER_404SCRIPT_PATH_HOME', '/a/common/wmf-config/missing.php' );
 define( 'MULTIVER_404SCRIPT_PATH_APACHE', 
'/srv/mediawiki/wmf-config/missing.php' );
diff --git a/multiversion/getMWVersion.php b/multiversion/getMWVersion.php
index f57abf3..979b4f6 100644
--- a/multiversion/getMWVersion.php
+++ b/multiversion/getMWVersion.php
@@ -19,7 +19,7 @@
  */
 function getWikiVersion( $dbName ) {
        $cdbFilename = getRealmSpecificFilename(
-               MULTIVER_COMMON_APACHE . '/wikiversions.cdb'
+               MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
        );
        try {
                $db = CdbReader::open( $cdbFilename );
diff --git a/multiversion/refreshWikiversionsCDB 
b/multiversion/refreshWikiversionsCDB
index 93c1dc4..cf3fb96 100755
--- a/multiversion/refreshWikiversionsCDB
+++ b/multiversion/refreshWikiversionsCDB
@@ -14,10 +14,10 @@
  * @return void
  */
 function refreshWikiversionsCDB() {
-       $srcPath = getRealmSpecificFilename( MULTIVER_COMMON_HOME . 
'/wikiversions.json' );
+       $srcPath = getRealmSpecificFilename( MULTIVER_CDB_DIR_HOME . 
'/wikiversions.json' );
 
        $cdbFilename = getRealmSpecificFilename(
-               MULTIVER_COMMON_HOME . '/wikiversions.cdb'
+               MULTIVER_CDB_DIR_HOME . '/wikiversions.cdb'
        );
 
        $tmpDBPath = $cdbFilename . '.tmp';
diff --git a/multiversion/updateWikiversions.php 
b/multiversion/updateWikiversions.php
index 6e249f4..9fac56e 100644
--- a/multiversion/updateWikiversions.php
+++ b/multiversion/updateWikiversions.php
@@ -22,7 +22,7 @@
 function updateWikiversions() {
        global $argv;
        $common = MULTIVER_COMMON_HOME;
-       $jsonPath = getRealmSpecificFilename( MULTIVER_COMMON_HOME . 
'/wikiversions.json' );
+       $jsonPath = getRealmSpecificFilename( MULTIVER_CDB_DIR_HOME . 
'/wikiversions.json' );
 
        if ( count( $argv ) !== 3 ) {
                print "Usage: updateWikiversions <name>.dblist php-X.XXwmfX\n";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48f4cdad5b32a0dba1b57b4ab326ec8e00e36b6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits