From 376b5d1098c6d2ae9f75b92b8228d05fdefc2276 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 20 Dec 2016 08:27:58 +0000 Subject: [PATCH] Use id.fp.o Signed-off-by: Patrick Uiterwijk --- roles/fas_server/templates/fas.cfg.j2 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2 index 19e1135cf9..91b3e3a3ca 100644 --- a/roles/fas_server/templates/fas.cfg.j2 +++ b/roles/fas_server/templates/fas.cfg.j2 @@ -62,15 +62,9 @@ tgcaptcha2.jpeg_generator = 'vanasco_dowty' ### ipa_sync_enabled = True ipa_sync_keytab = '/etc/fas_sync_keytab' -{% if env == "staging" %} -ipa_sync_principal = 'fas_sync@STG.FEDORAPROJECT.ORG' -ipa_sync_server = 'ipa01.stg.phx2.fedoraproject.org' -ipa_sync_certfile = '/etc/fas_sync_cert.pem' -{% else %} -ipa_sync_principal = 'fas_sync@FEDORAPROJECT.ORG' -ipa_sync_server = 'ipa01.phx2.fedoraproject.org' -ipa_sync_certfile = '/etc/fas_sync_cert.pem' -{% endif %} +ipa_sync_principal = 'fas_sync@{{ ipa_realm }}' +ipa_sync_server = 'id{{env_suffix}}.fedoraproject.org' +ipa_sync_certfile = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt' ### ### Administrative settings