Skip to content

Override config.php values through environment variables #3966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 3 commits into from
Apr 13, 2017
Merged

Override config.php values through environment variables #3966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
695a178
Override config.php values through ENV variables (#26570)
phisch Jan 24, 2017
0fcb37a
OC_ -> NC_
MorrisJobke Mar 21, 2017
95a21e2
Check for boolean false and add tests
MorrisJobke Mar 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
OC_ -> NC_ 
Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke
MorrisJobke committed Apr 4, 2017
commit 0fcb37adcb08e8a74d712ff8a6146f91fa14d7a9
4 changes: 2 additions & 2 deletions lib/private/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*/
class Config {

const ENV_PREFIX = 'OC_';
const ENV_PREFIX = 'NC_';

/** @var array Associative array ($key => $value) */
protected $cache = array();
Expand Down Expand Up @@ -76,7 +76,7 @@ public function getKeys() {
/**
* Returns a config value
*
* gets its value from an `OC_` prefixed environment variable
* gets its value from an `NC_` prefixed environment variable
* if it doesn't exist from config.php
* if this doesn't exist either, it will return the given `$default`
*
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/ConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function testGetValue() {

public function testGetValueReturnsEnvironmentValueIfSet() {
$this->assertEquals('bar', $this->config->getValue('foo'));
putenv('OC_foo=baz');
putenv('NC_foo=baz');
$this->assertEquals('baz', $this->config->getValue('foo'));
}

Expand Down