Page MenuHomePhabricator
Files F15463106

D7426.id.diff
No OneTemporary
Actions

D7426.id.diff
View Options

Index: conf/default.conf.php
===================================================================
--- conf/default.conf.php
+++ conf/default.conf.php
@@ -559,13 +559,6 @@
// to have.
'auth.sessions.conduit' => 5,
- // Set this true to enable the Settings -> SSH Public Keys panel, which will
- // allow users to associated SSH public keys with their accounts. This is only
- // really useful if you're setting up services over SSH and want to use
- // Phabricator for authentication; in most situations you can leave this
- // disabled.
- 'auth.sshkeys.enabled' => false,
-
// If true, email addresses must be verified (by clicking a link in an
// email) before a user can login. By default, verification is optional
// unless 'auth.email-domains' is nonempty (see below).
Index: src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
===================================================================
--- src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -162,6 +162,8 @@
'been migrated.'),
'differential.custom-remarkup-rules' => $markup_reason,
'differential.custom-remarkup-block-rules' => $markup_reason,
+ 'auth.sshkeys.enabled' => pht(
+ 'SSH keys are now actually useful, so they are always enabled.'),
);
return $ancient_config;
Index: src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
===================================================================
--- src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
+++ src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
@@ -29,21 +29,6 @@
pht(
"Maximum number of simultaneous Conduit sessions each user is ".
"permitted to have.")),
- $this->newOption('auth.sshkeys.enabled', 'bool', false)
- ->setBoolOptions(
- array(
- pht("Enable SSH key storage"),
- pht("Disable SSH key storage")))
- ->setSummary(
- pht("Allow users to associate SSH keys with their accounts."))
- ->setDescription(
- pht(
- "Set this true to enable the Settings -> SSH Public Keys panel, ".
- "which will allow users to associated SSH public keys with their ".
- "accounts. This is only really useful if you're setting up ".
- "services over SSH and want to use Phabricator for ".
- "authentication; in most situations you can leave this ".
- "disabled.")),
$this->newOption('auth.require-email-verification', 'bool', false)
->setBoolOptions(
array(
Index: src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
===================================================================
--- src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -16,7 +16,7 @@
}
public function isEnabled() {
- return PhabricatorEnv::getEnvConfig('auth.sshkeys.enabled');
+ return true;
}
public function processRequest(AphrontRequest $request) {

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 8:23 PM (6 d, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7586865
Default Alt Text
D7426.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility