Rush has submitted this change and it was merged.

Change subject: phab: VCS ssh listen on IPV6
......................................................................


phab: VCS ssh listen on IPV6

Bug: T100519
Change-Id: I677676b6d829c9ab5c4d7360fbee38416b6f4fba
---
M hieradata/role/eqiad/phabricator/main.yaml
M modules/phabricator/templates/sshd_config.phabricator.erb
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Rush: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/eqiad/phabricator/main.yaml 
b/hieradata/role/eqiad/phabricator/main.yaml
index b9b4a3a..5216b14 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -7,3 +7,4 @@
 phabricator::vcs::listen_addresses:
   - "208.80.154.250"
   - "10.64.32.186"
+  - "[2620:0:861:ed1a::3:16]"
diff --git a/modules/phabricator/templates/sshd_config.phabricator.erb 
b/modules/phabricator/templates/sshd_config.phabricator.erb
index 44d795a..a2d4ad2 100644
--- a/modules/phabricator/templates/sshd_config.phabricator.erb
+++ b/modules/phabricator/templates/sshd_config.phabricator.erb
@@ -4,6 +4,7 @@
 AuthorizedKeysCommandUser <%= @vcs_user %>
 AuthorizedKeysCommand <%= @ssh_hook_path %>
 AllowUsers <%= @vcs_user %>
+AddressFamily any
 
 Port 22
 PidFile /var/run/sshd/phab.pid

-- 
To view, visit https://gerrit.wikimedia.org/r/255168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I677676b6d829c9ab5c4d7360fbee38416b6f4fba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to