recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Specify an ssh port for Diffusion when running against the grain

Summary: We run `git` on a different port than 22, so would like to reflect this change in the UI.

Test Plan: Set diffusion.ssh-port in settings, then make sure it's reflected on the Diffusion repository Clone URI.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley

CC: Korvin, epriestley, aran, dctrwatson

Differential Revision: https://secure.phabricator.com/D7755

authored by

Matt Robenolt and committed by
epriestley c3d9c283 052c83a6

+8 -5
+7
src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
··· 109 109 'When constructing clone URIs to show to users, Diffusion will '. 110 110 'fill in this login username. If you have configured a VCS user '. 111 111 'like `git`, you should provide it here.')), 112 + $this->newOption('diffusion.ssh-port', 'int', null) 113 + ->setSummary(pht('Port for SSH connections to repositories.')) 114 + ->setDescription( 115 + pht( 116 + 'When constructing clone URIs to show to users, Diffusion by '. 117 + 'default will not display a port assuming the default for your '. 118 + 'VCS. Explicitly declare when running on a non-standard port.')), 112 119 ); 113 120 } 114 121
+1 -5
src/applications/diffusion/controller/DiffusionRepositoryController.php
··· 185 185 $uri->setUser($ssh_user); 186 186 } 187 187 188 - // This isn't quite right, but for now it's probably better to drop 189 - // the port than sometimes show ":8080", etc. Using most VCS commands 190 - // against nonstandard ports is a huge pain so few installs are likely 191 - // to configure SSH on a nonstandard port. 192 - $uri->setPort(null); 188 + $uri->setPort(PhabricatorEnv::getEnvConfig('diffusion.ssh-port')); 193 189 194 190 $clone_uri = $this->renderCloneURI( 195 191 $uri,