From 947226a6c11770e26440dcd98ea7ebf2faeb37b7 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 8 Jun 2020 15:54:55 -0700
Subject: [PATCH] iad2-move: adjust fas a bit for iad2.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/fas_server/templates/configmap.yml |  4 ++--
 roles/fas_server/templates/fas.cfg.j2    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/fas_server/templates/configmap.yml b/roles/fas_server/templates/configmap.yml
index ba9840971f..403ca1bf82 100644
--- a/roles/fas_server/templates/configmap.yml
+++ b/roles/fas_server/templates/configmap.yml
@@ -23,13 +23,13 @@ data:
      forwardable = true
     [realms]
      {{ ipa_realm }} = {
-      kdc = ipa01{{ env_suffix }}.phx2.fedoraproject.org
+      kdc = ipa01{{ env_suffix }}.iad2.fedoraproject.org
      }
     [domain_realm]
      .fedoraproject.org = FEDORAPROJECT.ORG
      fedoraproject.org = FEDORAPROJECT.ORG
     {% if env == "staging" %}
-     .stg.phx2.fedoraproject.org = STG.FEDORAPROJECT.ORG
+     .stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG
     {% endif %}
      .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
      stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2
index 8c39a97604..674e4fa25f 100644
--- a/roles/fas_server/templates/fas.cfg.j2
+++ b/roles/fas_server/templates/fas.cfg.j2
@@ -67,7 +67,7 @@ tgcaptcha2.jpeg_generator = 'vanasco_dowty'
 ipa_sync_enabled = True
 ipa_sync_keytab = '/etc/fas_sync_keytab/fas_sync_keytab'
 ipa_sync_principal = 'fas_sync@{{ ipa_realm }}'
-ipa_sync_server = 'ipa01{{env_suffix}}.phx2.fedoraproject.org'
+ipa_sync_server = 'ipa01{{env_suffix}}.iad2.fedoraproject.org'
 ipa_sync_certfile = '/etc/fas/fas_sync_cert.pem'
 
 ###
@@ -135,17 +135,17 @@ auto_approve_groups = 'packager:fedorabugs|qa:fedorabugs|security-team:fedorabug
 # Anti-spam approval check script, which injects in both registration and CLA steps
 # In Fedora, this is provided by the Basset service
 {% if env == "staging" %}
-antispam.api.url = 'http://basset01.stg.phx2.fedoraproject.org/basset'
+antispam.api.url = 'http://basset01.stg.iad2.fedoraproject.org/basset'
 antispam.api.username = '{{ basset_stg_frontend_user }}'
 antispam.api.password = '{{ basset_stg_frontend_pass }}'
 antispam.registration.autoaccept = False
 antispam.cla.autoaccept = False
 {% else %}
-antispam.api.url = 'http://basset01.phx2.fedoraproject.org/basset'
-antispam.api.username = '{{ basset_prod_frontend_user }}'
-antispam.api.password = '{{ basset_prod_frontend_pass }}'
-antispam.registration.autoaccept = False
-antispam.cla.autoaccept = False
+#antispam.api.url = 'http://basset01.iad2.fedoraproject.org/basset'
+#antispam.api.username = '{{ basset_prod_frontend_user }}'
+#antispam.api.password = '{{ basset_prod_frontend_pass }}'
+#antispam.registration.autoaccept = False
+#antispam.cla.autoaccept = False
 {% endif %}
 
 # Some server parameters that you may want to tweak