Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134767
Change subject: read configuration from /etc/fundraising/SmashPig
......................................................................
read configuration from /etc/fundraising/SmashPig
Deployment:
oh, be careful!
Change-Id: I6e67e68219b261cf261eb83317466259c87e7ec1
---
M Core/Configuration.php
M Core/Http/RequestHandler.php
M Maintenance/MaintenanceBase.php
3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/67/134767/1
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 2fd0f07..97a1468 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -10,6 +10,8 @@
*/
class Configuration {
+ protected const CONFIG_DEFAULT_PATH = "/etc/fundraising/SmashPig";
+
/** @var Configuration the default configuration object returned when
get_default_config is called */
protected static $defaultObj;
@@ -23,6 +25,13 @@
protected $viewName = 'default';
/**
+ * @return string path to directory containing configuration files
+ */
+ public static function getDefaultConfigDir() {
+ return Configuration::CONFIG_DEFAULT_PATH;
+ }
+
+ /**
* Obtains the current default configuration object. You should
probably be
* using a context call instead of this. See Context->getConfiguration()
*
diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index ba94728..a4a6d08 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -50,7 +50,7 @@
// --- Initialize core services ---
if ( $configPath === null ) {
- $configPath = AutoLoader::getInstallPath();
+ $configPath = Configuration::getDefaultConfigDir();
}
$config = new Configuration(
AutoLoader::makePath( $configPath,
'config_defaults.php' ),
diff --git a/Maintenance/MaintenanceBase.php b/Maintenance/MaintenanceBase.php
index 6039a98..be19717 100644
--- a/Maintenance/MaintenanceBase.php
+++ b/Maintenance/MaintenanceBase.php
@@ -133,7 +133,7 @@
$configFile = $this->getOption( 'config-file' );
$configNode = $this->getOption( 'config-node' );
$config = new Configuration(
- AutoLoader::makePath( static::getMaintenanceDir(),
'..', 'config_defaults.php' ),
+ AutoLoader::makePath(
Configuration::getDefaultConfigDir(), 'config_defaults.php' ),
$configFile,
$configNode,
true
--
To view, visit https://gerrit.wikimedia.org/r/134767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e67e68219b261cf261eb83317466259c87e7ec1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Adamw <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
