Skip to content

[stable10] Allow the config dir to be specified via the enviroment #1081

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 2 commits into from
Aug 26, 2016
Merged

[stable10] Allow the config dir to be specified via the enviroment #1081

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc8b508
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
gdamjan Jul 29, 2016
a076a0d
SetupController should use \OC::$configDir too
gdamjan Aug 2, 2016
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
SetupController should use \OC::$configDir too
  • Loading branch information
@gdamjan @nickvergessen
gdamjan authored and nickvergessen committed Aug 26, 2016
commit a076a0d17adeae60683e14576362efea7a01382d
2 changes: 1 addition & 1 deletion core/Controller/SetupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SetupController {
* @param Setup $setupHelper
*/
function __construct(Setup $setupHelper) {
$this->autoConfigFile = \OC::$SERVERROOT.'/config/autoconfig.php';
$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
$this->setupHelper = $setupHelper;
}

Expand Down