Page MenuHomePhorge
Files F2893733

No OneTemporary
Actions

View Options

diff --git a/conf/default.conf.php b/conf/default.conf.php
index cf02b03b6a..9003515814 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -1,48 +1,71 @@
<?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
return array(
// The root URI which Phabricator is installed on.
// Example: "http://phabricator.example.com/"
'phabricator.base-uri' => null,
- //
'phabricator.csrf-key' => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',
-// -- Facebook ---------------------------------------------------------------
+
+// -- MySQL --------------------------------------------------------------- //
+
+ // The username to use when connecting to MySQL.
+ 'mysql.user' => 'root',
+
+ // The password to use when connecting to MySQL.
+ 'mysql.pass' => '',
+
+ // The MySQL server to connect to.
+ 'mysql.host' => 'localhost',
+
+
+// -- Facebook ------------------------------------------------------------ //
// Can users use Facebook credentials to login to Phabricator?
'facebook.auth-enabled' => false,
// The Facebook "Application ID" to use for Facebook API access.
'facebook.application-id' => null,
// The Facebook "Application Secret" to use for Facebook API access.
'facebook.application-secret' => null,
+
+
+// -- Recaptcha ------------------------------------------------------------- //
+
+ // Is Recaptcha enabled? If disabled, captchas will not appear.
+ 'recaptcha.enabled' => false,
+
+ // Your Recaptcha public key, obtained from Recaptcha.
'recaptcha.public-key' => null,
+
+ // Your Recaptcha private key, obtained from Recaptcha.
'recaptcha.private-key' => null,
'user.default-profile-image-phid' => 'PHID-FILE-f57aaefce707fc4060ef',
+
);
diff --git a/src/applications/base/storage/lisk/PhabricatorLiskDAO.php b/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
index c27248660e..e0af5baeaa 100644
--- a/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
+++ b/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
@@ -1,54 +1,54 @@
<?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
abstract class PhabricatorLiskDAO extends LiskDAO {
public function establishConnection($mode) {
return new AphrontMySQLDatabaseConnection(
array(
- 'user' => 'root',
- 'pass' => '',
- 'host' => 'localhost',
+ 'user' => PhabricatorEnv::getEnvConfig('mysql.user'),
+ 'pass' => PhabricatorEnv::getEnvConfig('mysql.pass'),
+ 'host' => PhabricatorEnv::getEnvConfig('mysql.host'),
'database' => 'phabricator_'.$this->getApplicationName(),
));
}
public function getTableName() {
$str = 'phabricator';
$len = strlen($str);
$class = strtolower(get_class($this));
if (!strncmp($class, $str, $len)) {
$class = substr($class, $len);
}
$app = $this->getApplicationName();
if (!strncmp($class, $app, strlen($app))) {
$class = substr($class, strlen($app));
}
if (strlen($class)) {
return $app.'_'.$class;
} else {
return $app;
}
}
abstract public function getApplicationName();
}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Jan 19, 18:58 (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1127625
Default Alt Text
(4 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0