4 files changed +3
-23
lines changed Original file line number Diff line number Diff line change 559
559
// to have.
560
560
'auth.sessions.conduit ' => 5 ,
561
561
562
- // Set this true to enable the Settings -> SSH Public Keys panel, which will
563
- // allow users to associated SSH public keys with their accounts. This is only
564
- // really useful if you're setting up services over SSH and want to use
565
- // Phabricator for authentication; in most situations you can leave this
566
- // disabled.
567
- 'auth.sshkeys.enabled ' => false ,
568
-
569
562
// If true, email addresses must be verified (by clicking a link in an
570
563
// email) before a user can login. By default, verification is optional
571
564
// unless 'auth.email-domains' is nonempty (see below).
Original file line number Diff line number Diff line change @@ -162,6 +162,8 @@ public static function getAncientConfig() {
162
162
'been migrated. ' ),
163
163
'differential.custom-remarkup-rules ' => $ markup_reason ,
164
164
'differential.custom-remarkup-block-rules ' => $ markup_reason ,
165
+ 'auth.sshkeys.enabled ' => pht (
166
+ 'SSH keys are now actually useful, so they are always enabled. ' ),
165
167
);
166
168
167
169
return $ ancient_config ;
Original file line number Diff line number Diff line change @@ -29,21 +29,6 @@ public function getOptions() {
29
29
pht (
30
30
"Maximum number of simultaneous Conduit sessions each user is " .
31
31
"permitted to have. " )),
32
- $ this ->newOption ('auth.sshkeys.enabled ' , 'bool ' , false )
33
- ->setBoolOptions (
34
- array (
35
- pht ("Enable SSH key storage " ),
36
- pht ("Disable SSH key storage " )))
37
- ->setSummary (
38
- pht ("Allow users to associate SSH keys with their accounts. " ))
39
- ->setDescription (
40
- pht (
41
- "Set this true to enable the Settings -> SSH Public Keys panel, " .
42
- "which will allow users to associated SSH public keys with their " .
43
- "accounts. This is only really useful if you're setting up " .
44
- "services over SSH and want to use Phabricator for " .
45
- "authentication; in most situations you can leave this " .
46
- "disabled. " )),
47
32
$ this ->newOption ('auth.require-email-verification ' , 'bool ' , false )
48
33
->setBoolOptions (
49
34
array (
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ public function getPanelGroup() {
16
16
}
17
17
18
18
public function isEnabled () {
19
- return PhabricatorEnv:: getEnvConfig ( ' auth.sshkeys.enabled ' ) ;
19
+ return true ;
20
20
}
21
21
22
22
public function processRequest (AphrontRequest $ request ) {
0 commit comments