From dc795765be6f1b86dd1ce44ef134585592fe065e Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Wed, 4 Jan 2017 19:05:45 +0000
Subject: [PATCH] use ssh config with the correct port specified

---
 inventory/group_vars/qadevel                         | 2 +-
 roles/phabricator/templates/phabricator-sshd.conf.j2 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/inventory/group_vars/qadevel b/inventory/group_vars/qadevel
index b405c17b26..5264bdd0b6 100644
--- a/inventory/group_vars/qadevel
+++ b/inventory/group_vars/qadevel
@@ -17,7 +17,7 @@ tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 222]
 extra_enablerepos: ''
 
 sshd_port: 222
-sshd_config: ssh/sshd_config.qadevel
+sshd_config: ssh/sshd_config.qa-stg
 
 sslcertfile: wildcard-2016.qadevel.cloud.fedoraproject.org.cert
 sslkeyfile: wildcard-2016.qadevel.cloud.fedoraproject.org.key
diff --git a/roles/phabricator/templates/phabricator-sshd.conf.j2 b/roles/phabricator/templates/phabricator-sshd.conf.j2
index 8e6db5b330..1aa59fcdd5 100644
--- a/roles/phabricator/templates/phabricator-sshd.conf.j2
+++ b/roles/phabricator/templates/phabricator-sshd.conf.j2
@@ -9,7 +9,11 @@ AuthorizedKeysCommandUser {{ phabricator_vcs_user }}
 # You may need to tweak these options, but mostly they just turn off everything
 # dangerous.
 
+{% if sshd_port == 22 %}
+Port 222
+{%else%}
 Port 22
+{%end%}
 Protocol 2
 PermitRootLogin no
 AllowAgentForwarding no