infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

iad2-move: adjust fas a bit for iad2.

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-06-08 15:54:55 -07:00
parent 20fd3619e6
commit 947226a6c1
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/fas_server/templates/configmap.yml
View file

@ -23,13 +23,13 @@ data:
forwardable = true forwardable = true
[realms] [realms]
{{ ipa_realm }} = { {{ ipa_realm }} = {
kdc = ipa01{{ env_suffix }}.phx2.fedoraproject.org kdc = ipa01{{ env_suffix }}.iad2.fedoraproject.org
} }
[domain_realm] [domain_realm]
.fedoraproject.org = FEDORAPROJECT.ORG .fedoraproject.org = FEDORAPROJECT.ORG
fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG
{% if env == "staging" %} {% if env == "staging" %}
.stg.phx2.fedoraproject.org = STG.FEDORAPROJECT.ORG .stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG
{% endif %} {% endif %}
.stg.fedoraproject.org = STG.FEDORAPROJECT.ORG .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG

14
roles/fas_server/templates/fas.cfg.j2
View file

@ -67,7 +67,7 @@ tgcaptcha2.jpeg_generator = 'vanasco_dowty'
ipa_sync_enabled = True ipa_sync_enabled = True
ipa_sync_keytab = '/etc/fas_sync_keytab/fas_sync_keytab' ipa_sync_keytab = '/etc/fas_sync_keytab/fas_sync_keytab'
ipa_sync_principal = 'fas_sync@{{ ipa_realm }}' 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' 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 # Anti-spam approval check script, which injects in both registration and CLA steps
# In Fedora, this is provided by the Basset service # In Fedora, this is provided by the Basset service
{% if env == "staging" %} {% 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.username = '{{ basset_stg_frontend_user }}'
antispam.api.password = '{{ basset_stg_frontend_pass }}' antispam.api.password = '{{ basset_stg_frontend_pass }}'
antispam.registration.autoaccept = False antispam.registration.autoaccept = False
antispam.cla.autoaccept = False antispam.cla.autoaccept = False
{% else %} {% else %}
antispam.api.url = 'http://basset01.phx2.fedoraproject.org/basset' #antispam.api.url = 'http://basset01.iad2.fedoraproject.org/basset'
antispam.api.username = '{{ basset_prod_frontend_user }}' #antispam.api.username = '{{ basset_prod_frontend_user }}'
antispam.api.password = '{{ basset_prod_frontend_pass }}' #antispam.api.password = '{{ basset_prod_frontend_pass }}'
antispam.registration.autoaccept = False #antispam.registration.autoaccept = False
antispam.cla.autoaccept = False #antispam.cla.autoaccept = False
{% endif %} {% endif %}
# Some server parameters that you may want to tweak # Some server parameters that you may want to tweak